diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-02-07 23:07:27 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-02-08 14:25:07 +0000 |
| commit | 70381f774c1f8b272b18f9a5403a02e6bb05125d (patch) | |
| tree | 4c0fb3d66cb5a0fbc3b6fc7275d51b88765e2932 /ui/cli | |
| parent | c5483f4213ea5fa7709e529d99348734bbfe5daf (diff) | |
| download | wireshark-70381f774c1f8b272b18f9a5403a02e6bb05125d.tar.gz | |
Switch stat tap to use wmem_tree_t instead of (sorted) GSList.
Change-Id: I172167eb20793113562b69d1e0e93a4882200404
Reviewed-on: https://code.wireshark.org/review/20019
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/cli')
| -rw-r--r-- | ui/cli/tap-simple_stattable.c | 9 | ||||
| -rw-r--r-- | ui/cli/tshark-tap.h | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ui/cli/tap-simple_stattable.c b/ui/cli/tap-simple_stattable.c index 9f52eb458d..4f3f4d9da7 100644 --- a/ui/cli/tap-simple_stattable.c +++ b/ui/cli/tap-simple_stattable.c @@ -140,20 +140,21 @@ simple_stat_init(const char *opt_arg, void* userdata) init_stat_table(new_stat_tap, filter); } -void -register_simple_stat_tables(gpointer data, gpointer user_data _U_) +gboolean +register_simple_stat_tables(const void *key, void *value, void *userdata _U_) { - stat_tap_table_ui *new_stat_tap = (stat_tap_table_ui*)data; + stat_tap_table_ui *new_stat_tap = (stat_tap_table_ui*)value; stat_tap_ui ui_info; ui_info.group = new_stat_tap->group; ui_info.title = new_stat_tap->title; /* construct this from the protocol info? */ - ui_info.cli_string = new_stat_tap->cli_string; + ui_info.cli_string = (const char*)key; ui_info.tap_init_cb = simple_stat_init; ui_info.nparams = new_stat_tap->nparams; ui_info.params = new_stat_tap->params; register_stat_tap_ui(&ui_info, new_stat_tap); + return FALSE; } /* diff --git a/ui/cli/tshark-tap.h b/ui/cli/tshark-tap.h index 7dc2a98746..dcc6bf3ce6 100644 --- a/ui/cli/tshark-tap.h +++ b/ui/cli/tshark-tap.h @@ -28,6 +28,6 @@ extern void init_iousers(struct register_ct* ct, const char *filter); extern void init_hostlists(struct register_ct* ct, const char *filter); 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); +extern gboolean register_simple_stat_tables(const void *key, void *value, void *userdata); #endif /* __TSHARK_TAP_H__ */ |