diff options
author | Guy Harris <guy@alum.mit.edu> | 2018-02-18 14:39:49 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2018-02-19 00:12:51 +0000 |
commit | c61b543e97f85fbe6a30f0368a7c6975bdd21fc8 (patch) | |
tree | 8edb2fe7f63d7113b91c96442640a3b21c3fb006 /epan/stat_tap_ui.h | |
parent | 6a0a56ed078ef8a51b7c7b26acd0baa700b5c8d4 (diff) |
Get rid of more new_ prefixes for statistics functions and types.
There are no "old" versions of them that we're keeping around.
Change-Id: I3c76a14d0ec1a06df39c547da37f4dea9987df4d
Reviewed-on: https://code.wireshark.org/review/25892
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/stat_tap_ui.h')
-rw-r--r-- | epan/stat_tap_ui.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/epan/stat_tap_ui.h b/epan/stat_tap_ui.h index 411e5557fa..20eb590d7d 100644 --- a/epan/stat_tap_ui.h +++ b/epan/stat_tap_ui.h @@ -116,9 +116,9 @@ typedef struct _stat_tap_table } stat_tap_table; -typedef void (*new_stat_tap_gui_init_cb)(stat_tap_table* stat_table, void* gui_data); /* GTK+ only? */ -typedef void (*new_stat_tap_gui_reset_cb)(stat_tap_table* stat_table, void* gui_data); /* GTK+ only? */ -typedef void (*new_stat_tap_gui_free_cb)(stat_tap_table* stat_table, void* gui_data); /* GTK+ only? */ +typedef void (*stat_tap_gui_init_cb)(stat_tap_table* stat_table, void* gui_data); /* GTK+ only? */ +typedef void (*stat_tap_gui_reset_cb)(stat_tap_table* stat_table, void* gui_data); /* GTK+ only? */ +typedef void (*stat_tap_gui_free_cb)(stat_tap_table* stat_table, void* gui_data); /* GTK+ only? */ /* * UI information for a tap with a table-based UI. @@ -128,7 +128,7 @@ typedef struct _stat_tap_table_ui { const char *title; /* title of statistic */ const char *tap_name; const char *cli_string; /* initial part of the "-z" argument for statistic */ - void (* stat_tap_init_cb)(struct _stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data); + void (* stat_tap_init_cb)(struct _stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data); tap_packet_cb packet_func; void (* stat_tap_reset_table_cb)(stat_tap_table* table); void (* stat_tap_free_table_item_cb)(stat_tap_table* table, guint row, guint column, stat_tap_table_item_type* field_data); @@ -144,10 +144,10 @@ typedef struct _stat_tap_table_ui { /** tap data */ -typedef struct _new_stat_data_t { +typedef struct _stat_data_t { stat_tap_table_ui *stat_tap_data; void *user_data; /**< "GUI" specifics (if necessary) */ -} new_stat_data_t; +} stat_data_t; /** Register UI information for a tap. @@ -158,18 +158,18 @@ typedef struct _new_stat_data_t { WS_DLL_PUBLIC void register_stat_tap_ui(stat_tap_ui *ui, void *userdata); WS_DLL_PUBLIC void register_stat_tap_table_ui(stat_tap_table_ui *ui); -WS_DLL_PUBLIC void new_stat_tap_iterate_tables(wmem_foreach_func func, gpointer user_data); -WS_DLL_PUBLIC void new_stat_tap_get_filter(stat_tap_table_ui* new_stat, const char *opt_arg, const char **filter, char** err); -WS_DLL_PUBLIC stat_tap_table* new_stat_tap_init_table(const char *name, int num_fields, int num_elements, - const char *filter_string, new_stat_tap_gui_init_cb gui_callback, void* gui_data); -WS_DLL_PUBLIC void new_stat_tap_add_table(stat_tap_table_ui* new_stat, stat_tap_table* table); +WS_DLL_PUBLIC void stat_tap_iterate_tables(wmem_foreach_func func, gpointer user_data); +WS_DLL_PUBLIC void stat_tap_get_filter(stat_tap_table_ui* new_stat, const char *opt_arg, const char **filter, char** err); +WS_DLL_PUBLIC stat_tap_table* stat_tap_init_table(const char *name, int num_fields, int num_elements, + const char *filter_string, stat_tap_gui_init_cb gui_callback, void* gui_data); +WS_DLL_PUBLIC void stat_tap_add_table(stat_tap_table_ui* new_stat, stat_tap_table* table); -WS_DLL_PUBLIC void new_stat_tap_init_table_row(stat_tap_table *stat_table, guint table_index, guint num_fields, const stat_tap_table_item_type* fields); -WS_DLL_PUBLIC stat_tap_table_item_type* new_stat_tap_get_field_data(const stat_tap_table *stat_table, guint table_index, guint field_index); -WS_DLL_PUBLIC void new_stat_tap_set_field_data(stat_tap_table *stat_table, guint table_index, guint field_index, stat_tap_table_item_type* field_data); -WS_DLL_PUBLIC void reset_stat_table(stat_tap_table_ui* new_stat, new_stat_tap_gui_reset_cb gui_callback, void *callback_data); +WS_DLL_PUBLIC void stat_tap_init_table_row(stat_tap_table *stat_table, guint table_index, guint num_fields, const stat_tap_table_item_type* fields); +WS_DLL_PUBLIC stat_tap_table_item_type* stat_tap_get_field_data(const stat_tap_table *stat_table, guint table_index, guint field_index); +WS_DLL_PUBLIC void stat_tap_set_field_data(stat_tap_table *stat_table, guint table_index, guint field_index, stat_tap_table_item_type* field_data); +WS_DLL_PUBLIC void reset_stat_table(stat_tap_table_ui* new_stat, stat_tap_gui_reset_cb gui_callback, void *callback_data); -WS_DLL_PUBLIC stat_tap_table_ui *new_stat_tap_by_name(const char *name); +WS_DLL_PUBLIC stat_tap_table_ui *stat_tap_by_name(const char *name); /** Free all of the tables associated with a stat_tap_table_ui. * @@ -182,7 +182,7 @@ WS_DLL_PUBLIC stat_tap_table_ui *new_stat_tap_by_name(const char *name); * Provided by the UI. * @param callback_data Data for the per-table callback. */ -WS_DLL_PUBLIC void free_stat_tables(stat_tap_table_ui* new_stat, new_stat_tap_gui_free_cb gui_callback, void *callback_data); +WS_DLL_PUBLIC void free_stat_tables(stat_tap_table_ui* new_stat, stat_tap_gui_free_cb gui_callback, void *callback_data); WS_DLL_PUBLIC gboolean process_stat_cmd_arg(char *optstr); |