diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-19 11:01:56 +0200 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-19 10:47:10 +0000 |
commit | a383e692c8774c2451a55d8b3f8ef9db5d037329 (patch) | |
tree | ab6223527915ab1127a50563981816adc18b971f /ui/cli/tap-sctpchunkstat.c | |
parent | ff845123f1f1ecef0d8e0d8980e6e9d7267e5f6b (diff) |
Revert "tap: change glib functions to wmem."
This reverts commit 2e9f3c5d366eaa7139fc877b5301392166b3f985.
It breaks the registration of codec, dissector and libwiretap plugins.
Change-Id: I4ef91dd192f765adf87ea9fe9f3693e25dbd24de
Reviewed-on: https://code.wireshark.org/review/16012
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'ui/cli/tap-sctpchunkstat.c')
-rw-r--r-- | ui/cli/tap-sctpchunkstat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/cli/tap-sctpchunkstat.c b/ui/cli/tap-sctpchunkstat.c index cb8efdc42b..2d41d362ae 100644 --- a/ui/cli/tap-sctpchunkstat.c +++ b/ui/cli/tap-sctpchunkstat.c @@ -198,7 +198,7 @@ static void sctpstat_init(const char *opt_arg, void *userdata _U_) { sctpstat_t *hs; - gchar *error_string; + GString *error_string; hs = (sctpstat_t *)g_malloc(sizeof(sctpstat_t)); if (!strncmp(opt_arg, "sctp,stat,", 11)) { @@ -218,8 +218,8 @@ sctpstat_init(const char *opt_arg, void *userdata _U_) g_free(hs); fprintf(stderr, "tshark: Couldn't register sctp,stat tap: %s\n", - error_string); - wmem_free(NULL, error_string); + error_string->str); + g_string_free(error_string, TRUE); exit(1); } } |