diff options
author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2017-05-15 15:07:34 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2017-05-16 04:27:05 +0000 |
commit | 400bff055f697534ca0f1de034c4e38f13454a09 (patch) | |
tree | cc1834380d8ff0cb7e82a99de48cb1ab475113db /ui/gtk | |
parent | bb6e31d8cce2d8b1c56722a816ef608555ece45f (diff) |
sharkd: export uat records.
Move gtk's fld_tostr() to epan API as uat_fld_tostr.
Change-Id: I01e3b66ca9ea3cd1e2e06e2122190ee42b9ad44b
Reviewed-on: https://code.wireshark.org/review/21664
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/gtk')
-rw-r--r-- | ui/gtk/uat_gui.c | 46 |
1 files changed, 4 insertions, 42 deletions
diff --git a/ui/gtk/uat_gui.c b/ui/gtk/uat_gui.c index aea06302cb..13c89489d9 100644 --- a/ui/gtk/uat_gui.c +++ b/ui/gtk/uat_gui.c @@ -167,44 +167,6 @@ static void limit_buttons(uat_t *uat) { gtk_widget_set_sensitive (uat->rep->bt_clear, FALSE); } -static char *fld_tostr(void *rec, uat_field_t *f) { - guint len; - char *ptr; - char *out; - - f->cb.tostr(rec, &ptr, &len, f->cbdata.tostr, f->fld_data); - - switch(f->mode) { - case PT_TXTMOD_NONE: - case PT_TXTMOD_STRING: - case PT_TXTMOD_ENUM: - case PT_TXTMOD_FILENAME: - case PT_TXTMOD_DIRECTORYNAME: - out = g_strndup(ptr, len); - break; - case PT_TXTMOD_HEXBYTES: { - GString *s = g_string_sized_new( len*2 + 1 ); - guint i; - - for (i=0; i<len;i++) g_string_append_printf(s, "%.2X", ((const guint8*)ptr)[i]); - - out = g_strdup(s->str); - - g_string_free(s, TRUE); - break; - } - default: - g_assert_not_reached(); - out = NULL; - break; - } - - g_free(ptr); - return out; -} - - - static void append_row(uat_t *uat, guint idx) { void *rec = UAT_INDEX_PTR(uat, idx); uat_field_t *f = uat->fields; @@ -216,7 +178,7 @@ static void append_row(uat_t *uat, guint idx) { gtk_list_store_insert_before(uat->rep->list_store, &iter, NULL); for ( colnum = 0; colnum < uat->ncols; colnum++ ) { - tmp_str = fld_tostr(rec, &(f[colnum])); + tmp_str = uat_fld_tostr(rec, &(f[colnum])); gtk_list_store_set(uat->rep->list_store, &iter, colnum, tmp_str, -1); g_free(tmp_str); } @@ -238,7 +200,7 @@ static void reset_row(uat_t *uat, guint idx) { } for ( colnum = 0; colnum < uat->ncols; colnum++ ) { - tmp_str = fld_tostr(rec, &(f[colnum])); + tmp_str = uat_fld_tostr(rec, &(f[colnum])); gtk_list_store_set(uat->rep->list_store, &iter, colnum, tmp_str, -1); g_free(tmp_str); } @@ -511,7 +473,7 @@ static void uat_edit_dialog(uat_t *uat, gint row, gboolean copy) { for ( colnum = 0; colnum < uat->ncols; colnum++ ) { GtkWidget *entry, *label, *event_box; - char *text = fld_tostr(dd->rec, &(f[colnum])); + char *text = uat_fld_tostr(dd->rec, &(f[colnum])); char *label_text; gchar *fc_filename; @@ -681,7 +643,7 @@ static void uat_del_dlg(uat_t *uat, int idx) { for ( colnum = 0; colnum < uat->ncols; colnum++ ) { GtkWidget *label; - char *text = fld_tostr(rec, &(f[colnum])); + char *text = uat_fld_tostr(rec, &(f[colnum])); tmp_str = g_strdup_printf("%s:", f[colnum].title); label = gtk_label_new(tmp_str); |