diff options
| -rw-r--r-- | epan/wslua/init_wslua.c | 2 | ||||
| -rw-r--r-- | epan/wslua/wslua_field.c | 1 | ||||
| -rw-r--r-- | epan/wslua/wslua_gui.c | 3 | ||||
| -rw-r--r-- | epan/wslua/wslua_pinfo.c | 4 | ||||
| -rw-r--r-- | epan/wslua/wslua_proto.c | 8 | ||||
| -rw-r--r-- | epan/wslua/wslua_tvb.c | 8 | ||||
| -rw-r--r-- | epan/wslua/wslua_util.c | 1 |
7 files changed, 6 insertions, 21 deletions
diff --git a/epan/wslua/init_wslua.c b/epan/wslua/init_wslua.c index c9bcc848a6..bb4971bef6 100644 --- a/epan/wslua/init_wslua.c +++ b/epan/wslua/init_wslua.c @@ -263,7 +263,7 @@ static void basic_logger(const gchar *log_domain _U_, static int wslua_panic(lua_State* LS) { g_error("LUA PANIC: %s",lua_tostring(LS,-1)); - return 0; + /** g_error() does an abort() and thus never returns **/ } static void lua_load_plugins (const char *dirname) diff --git a/epan/wslua/wslua_field.c b/epan/wslua/wslua_field.c index 2effed0215..f39633b2eb 100644 --- a/epan/wslua/wslua_field.c +++ b/epan/wslua/wslua_field.c @@ -424,7 +424,6 @@ WSLUA_METAMETHOD Field__call (lua_State* L) { if (! lua_pinfo ) { WSLUA_ERROR(Field__call,"Fields cannot be used outside dissectors or taps"); - return 0; } for (;in;in = in->same_name_next) { diff --git a/epan/wslua/wslua_gui.c b/epan/wslua/wslua_gui.c index 3f34069fc5..83f77311d3 100644 --- a/epan/wslua/wslua_gui.c +++ b/epan/wslua/wslua_gui.c @@ -216,17 +216,14 @@ WSLUA_FUNCTION wslua_new_dialog(lua_State* L) { /* Pops up a new dialog */ if (! (title = luaL_checkstring(L,WSLUA_ARG_new_dialog_TITLE)) ) { WSLUA_ARG_ERROR(new_dialog,TITLE,"Must be a string"); - return 0; } if (! lua_isfunction(L,WSLUA_ARG_new_dialog_ACTION)) { WSLUA_ARG_ERROR(new_dialog,ACTION,"Must be a function"); - return 0; } if (top < 3) { WSLUA_ERROR(new_dialog,"At least one field required"); - return 0; } diff --git a/epan/wslua/wslua_pinfo.c b/epan/wslua/wslua_pinfo.c index 36132bf07c..1e141a4415 100644 --- a/epan/wslua/wslua_pinfo.c +++ b/epan/wslua/wslua_pinfo.c @@ -507,9 +507,7 @@ WSLUA_METAMETHOD Columns__newindex(lua_State *L) { } } - WSLUA_ARG_ERROR(Columns__newindex,COLUMN,"the column name must be a valid column"); - - return 0; + WSLUA_ARG_ERROR(Columns__newindex,COLUMN,"the column name must be a valid column"); } WSLUA_METAMETHOD Columns_index(lua_State *L) { diff --git a/epan/wslua/wslua_proto.c b/epan/wslua/wslua_proto.c index 86fbf555b4..805726acae 100644 --- a/epan/wslua/wslua_proto.c +++ b/epan/wslua/wslua_proto.c @@ -388,7 +388,6 @@ WSLUA_METAMETHOD Prefs__index(lua_State* L) { } while (( prefs_p = prefs_p->next )); WSLUA_ARG_ERROR(Prefs__index,NAME,"no preference named like this"); - WSLUA_RETURN(0); } WSLUA_META Prefs_meta[] = { @@ -605,10 +604,8 @@ WSLUA_CONSTRUCTOR ProtoField_new(lua_State* L) { /* Creates a new field to be us f->type = get_ftenum(luaL_checkstring(L,WSLUA_ARG_ProtoField_new_TYPE)); /*XXX do it better*/ - if (f->type == FT_NONE) { + if (f->type == FT_NONE) WSLUA_ARG_ERROR(ProtoField_new,TYPE,"invalid FT_type"); - return 0; - } if (! lua_isnil(L,WSLUA_OPTARG_ProtoField_new_VOIDSTRING) ) { if (f->type == FT_BOOLEAN) { @@ -1086,9 +1083,8 @@ WSLUA_CONSTRUCTOR Proto_new(lua_State* L) { WSLUA_RETURN(1); /* The newly created protocol */ } - } else { + } else WSLUA_ARG_ERROR(Proto_new,NAME,"must be a string"); - } return 0; } diff --git a/epan/wslua/wslua_tvb.c b/epan/wslua/wslua_tvb.c index 5df3b9fa74..f308216bc8 100644 --- a/epan/wslua/wslua_tvb.c +++ b/epan/wslua/wslua_tvb.c @@ -45,10 +45,8 @@ WSLUA_CONSTRUCTOR ByteArray_new(lua_State* L) { /* Creates a ByteArray Object */ if (lua_gettop(L) == 1) { s = luaL_checkstring(L,WSLUA_OPTARG_ByteArray_new_HEXBYTES); - if (!s) { + if (!s) WSLUA_OPTARG_ERROR(ByteArray_new,HEXBYTES,"must be a string"); - return 0; - } /* XXX: slow! */ for (; (c = *s); s++) { @@ -144,10 +142,8 @@ WSLUA_METHOD ByteArray_set_size(lua_State* L) { guint8* padding; if (!ba) return 0; - if (siz < 0) { + if (siz < 0) WSLUA_ERROR(ByteArray_set_size,"ByteArray size must be non-negative"); - return 0; - } if (ba->len >= (guint)siz) { /* truncate */ g_byte_array_set_size(ba,siz); diff --git a/epan/wslua/wslua_util.c b/epan/wslua/wslua_util.c index 04d9a699bb..46a656b74e 100644 --- a/epan/wslua/wslua_util.c +++ b/epan/wslua/wslua_util.c @@ -287,7 +287,6 @@ WSLUA_CONSTRUCTOR Dir_open(lua_State* L) { g_free(dir); WSLUA_ARG_ERROR(Dir_open,PATHNAME,"could not open directory"); - return 0; } pushDir(L,dir); |