diff options
author | Dario Lombardo <lomato@gmail.com> | 2016-05-03 18:40:17 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2016-06-17 15:38:03 +0000 |
commit | 2e9f3c5d366eaa7139fc877b5301392166b3f985 (patch) | |
tree | ac2d04b7cc1b8d6c8962d437584e351fcf1bf450 /epan/wslua | |
parent | 2aa55a387a87cd4f740aea661ca1ca535cd2e392 (diff) |
tap: change glib functions to wmem.
Change-Id: I878ae6b121a669f9b7f4e1e57bc079f0cb44c0bf
Reviewed-on: https://code.wireshark.org/review/15270
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/wslua')
-rw-r--r-- | epan/wslua/wslua_field.c | 6 | ||||
-rw-r--r-- | epan/wslua/wslua_listener.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/epan/wslua/wslua_field.c b/epan/wslua/wslua_field.c index d64513c5a2..5707300be9 100644 --- a/epan/wslua/wslua_field.c +++ b/epan/wslua/wslua_field.c @@ -591,15 +591,15 @@ void lua_prime_all_fields(proto_tree* tree _U_) { if (fake_tap && fake_tap_filter->len > strlen("frame")) { /* a boring tap :-) */ - GString* error = register_tap_listener("frame", + gchar* error = register_tap_listener("frame", &fake_tap, fake_tap_filter->str, 0, /* XXX - do we need the protocol tree or columns? */ NULL, NULL, NULL); if (error) { - report_failure("while registering lua_fake_tap:\n%s",error->str); - g_string_free(error,TRUE); + report_failure("while registering lua_fake_tap:\n%s", error); + wmem_free(NULL, error); } else if (!dfilter_compile(fake_tap_filter->str, &wslua_dfilter, &err_msg)) { report_failure("while compiling dfilter \"%s\" for wslua: %s", fake_tap_filter->str, err_msg); g_free(err_msg); diff --git a/epan/wslua/wslua_listener.c b/epan/wslua/wslua_listener.c index 85caa7316c..9d87ee5bbe 100644 --- a/epan/wslua/wslua_listener.c +++ b/epan/wslua/wslua_listener.c @@ -210,7 +210,7 @@ WSLUA_CONSTRUCTOR Listener_new(lua_State* L) { const gchar* filter = luaL_optstring(L,WSLUA_OPTARG_Listener_new_FILTER,NULL); const gboolean all_fields = wslua_optbool(L, WSLUA_OPTARG_Listener_new_ALLFIELDS, FALSE); Listener tap; - GString* error; + gchar* error; tap = (Listener)g_malloc(sizeof(struct _wslua_tap)); @@ -237,8 +237,8 @@ WSLUA_CONSTRUCTOR Listener_new(lua_State* L) { g_free(tap->name); g_free(tap); /* WSLUA_ERROR(new_tap,"tap registration error"); */ - lua_pushfstring(L,"Error while registering tap:\n%s",error->str); - g_string_free(error,TRUE); + lua_pushfstring(L,"Error while registering tap:\n%s",error); + wmem_free(NULL, error); luaL_error(L,lua_tostring(L,-1)); } |