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 /ui/gtk/expert_comp_dlg.c | |
| 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 'ui/gtk/expert_comp_dlg.c')
| -rw-r--r-- | ui/gtk/expert_comp_dlg.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ui/gtk/expert_comp_dlg.c b/ui/gtk/expert_comp_dlg.c index 9450bbbbae..8087b47dda 100644 --- a/ui/gtk/expert_comp_dlg.c +++ b/ui/gtk/expert_comp_dlg.c @@ -143,7 +143,7 @@ expert_comp_select_filter_cb(GtkWidget *widget, gpointer callback_data, guint ca { expert_comp_dlg_t *ss = (expert_comp_dlg_t *)callback_data; const char *filter; - GString *error_string; + gchar *error_string; ss->use_dfilter = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (widget)); if (ss->use_dfilter) { @@ -153,14 +153,14 @@ expert_comp_select_filter_cb(GtkWidget *widget, gpointer callback_data, guint ca } error_string = set_tap_dfilter (ss, filter); if (error_string) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); - g_string_free(error_string, TRUE); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string); + wmem_free(NULL, error_string); return; } error_string = set_tap_dfilter (ss->etd, filter); if (error_string) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); - g_string_free(error_string, TRUE); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string); + wmem_free(NULL, error_string); return; } @@ -791,7 +791,7 @@ static void expert_comp_init(const char *opt_arg _U_, void* userdata _U_) { expert_comp_dlg_t *ss; - GString *error_string; + gchar *error_string; GtkWidget *temp_page, *details_page, *comments_page; GtkWidget *main_nb; GtkWidget *vbox; @@ -950,8 +950,8 @@ expert_comp_init(const char *opt_arg _U_, void* userdata _U_) expert_dlg_packet, expert_dlg_draw); if(error_string){ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); - g_string_free(error_string, TRUE); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string); + wmem_free(NULL, error_string); g_free(ss->etd); return; } @@ -964,8 +964,8 @@ expert_comp_init(const char *opt_arg _U_, void* userdata _U_) error_string=register_tap_listener("expert", ss, NULL, TL_REQUIRES_NOTHING, error_reset, error_packet, expert_comp_draw); if(error_string){ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); - g_string_free(error_string, TRUE); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string); + wmem_free(NULL, error_string); g_free(ss); return; } |