diff options
| author | Evan Huus <eapache@gmail.com> | 2014-06-15 12:07:10 -0400 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-06-16 15:36:44 +0000 |
| commit | c76b70fa12de10c969227d49f8dfae497eaf0f09 (patch) | |
| tree | 781173d67997b9ef5b7ce6e093ee701953d48be5 /ui/gtk | |
| parent | 83f9cc6603387c8394060b36e719651bb87b6c6b (diff) | |
Remove last remaining call to se_strdup
get_filter_from_packet_list_row_and_column now returns glib memory
Change-Id: I24361670322ff4a936c157a842b07f32c474089e
Reviewed-on: https://code.wireshark.org/review/2240
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'ui/gtk')
| -rw-r--r-- | ui/gtk/main.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 293767ecf1..8bc7fed661 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -612,15 +612,15 @@ get_filter_from_packet_list_row_and_column(gpointer data) header_field_info *hfi = proto_registrar_get_byname(cfile.cinfo.col_custom_field[column]); if (hfi && hfi->parent == -1) { /* Protocol only */ - buf = se_strdup(cfile.cinfo.col_expr.col_expr[column]); + buf = g_strdup(cfile.cinfo.col_expr.col_expr[column]); } else if (hfi && IS_FT_STRING(hfi->type)) { /* Custom string, add quotes */ - buf = se_strdup_printf("%s == \"%s\"", cfile.cinfo.col_expr.col_expr[column], + buf = g_strdup_printf("%s == \"%s\"", cfile.cinfo.col_expr.col_expr[column], cfile.cinfo.col_expr.col_expr_val[column]); } } if (buf == NULL) { - buf = se_strdup_printf("%s == %s", cfile.cinfo.col_expr.col_expr[column], + buf = g_strdup_printf("%s == %s", cfile.cinfo.col_expr.col_expr[column], cfile.cinfo.col_expr.col_expr_val[column]); } } @@ -635,9 +635,14 @@ get_filter_from_packet_list_row_and_column(gpointer data) void match_selected_plist_cb(gpointer data, MATCH_SELECTED_E action) { + char *filter; + + filter = get_filter_from_packet_list_row_and_column((GtkWidget *)data); + match_selected_cb_do((GtkWidget *)g_object_get_data(G_OBJECT(data), E_DFILTER_TE_KEY), - action, - get_filter_from_packet_list_row_and_column((GtkWidget *)data)); + action, filter); + + g_free(filter); } /* This function allows users to right click in the details window and copy the text |