diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-02-07 20:18:33 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-02-08 14:24:42 +0000 |
| commit | 89dfa6bdf4051bc0f7ae64925814d811a37c628a (patch) | |
| tree | 68c6dfb2eb1f2b06ca858a8f06c9e313f5a72555 /ui/cli | |
| parent | 243c09fa06bf7646b577e2baf024106432ec1bd9 (diff) | |
| download | wireshark-89dfa6bdf4051bc0f7ae64925814d811a37c628a.tar.gz | |
Switch rtd and srt tables to use wmem_tree_t instead of (sorted) GSList.
Change-Id: I54fec10801eb8f359414f34bf705767964c9725e
Reviewed-on: https://code.wireshark.org/review/20017
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/cli')
| -rw-r--r-- | ui/cli/tap-rtd.c | 7 | ||||
| -rw-r--r-- | ui/cli/tap-srt.c | 9 | ||||
| -rw-r--r-- | ui/cli/tshark-tap.h | 4 |
3 files changed, 11 insertions, 9 deletions
diff --git a/ui/cli/tap-rtd.c b/ui/cli/tap-rtd.c index 2e43286b62..ee3c0a64e5 100644 --- a/ui/cli/tap-rtd.c +++ b/ui/cli/tap-rtd.c @@ -141,10 +141,10 @@ dissector_rtd_init(const char *opt_arg, void* userdata) } /* Set GUI fields for register_rtd list */ -void -register_rtd_tables(gpointer data, gpointer user_data _U_) +gboolean +register_rtd_tables(const void *key _U_, void *value, void *userdata _U_) { - register_rtd_t *rtd = (register_rtd_t*)data; + register_rtd_t *rtd = (register_rtd_t*)value; stat_tap_ui ui_info; ui_info.group = REGISTER_STAT_GROUP_RESPONSE_TIME; @@ -154,6 +154,7 @@ register_rtd_tables(gpointer data, gpointer user_data _U_) ui_info.nparams = 0; ui_info.params = NULL; register_stat_tap_ui(&ui_info, rtd); + return FALSE; } /* diff --git a/ui/cli/tap-srt.c b/ui/cli/tap-srt.c index 32fde53594..11286c5dfb 100644 --- a/ui/cli/tap-srt.c +++ b/ui/cli/tap-srt.c @@ -161,17 +161,17 @@ dissector_srt_init(const char *opt_arg, void* userdata) } /* Set GUI fields for register_srt list */ -void -register_srt_tables(gpointer data, gpointer user_data _U_) +gboolean +register_srt_tables(const void *key _U_, void *value, void *userdata _U_) { - register_srt_t *srt = (register_srt_t*)data; + register_srt_t *srt = (register_srt_t*)value; const char* short_name = proto_get_protocol_short_name(find_protocol_by_id(get_srt_proto_id(srt))); stat_tap_ui ui_info; /* XXX - CAMEL dissector hasn't been converted over due seemingly different tap packet handling functions. So let the existing TShark CAMEL tap keep its registration */ if (strcmp(short_name, "CAMEL") == 0) - return; + return FALSE; ui_info.group = REGISTER_STAT_GROUP_RESPONSE_TIME; ui_info.title = NULL; /* construct this from the protocol info? */ @@ -180,6 +180,7 @@ register_srt_tables(gpointer data, gpointer user_data _U_) ui_info.nparams = 0; ui_info.params = NULL; register_stat_tap_ui(&ui_info, srt); + return FALSE; } /* diff --git a/ui/cli/tshark-tap.h b/ui/cli/tshark-tap.h index d3f8d0179c..7dc2a98746 100644 --- a/ui/cli/tshark-tap.h +++ b/ui/cli/tshark-tap.h @@ -26,8 +26,8 @@ extern void init_iousers(struct register_ct* ct, const char *filter); extern void init_hostlists(struct register_ct* ct, const char *filter); -extern void register_srt_tables(gpointer data, gpointer user_data); -extern void register_rtd_tables(gpointer data, gpointer user_data); +extern gboolean register_srt_tables(const void *key, void *value, void *userdata); +extern gboolean register_rtd_tables(const void *key, void *value, void *userdata); extern void register_simple_stat_tables(gpointer data, gpointer user_data); #endif /* __TSHARK_TAP_H__ */ |