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>

5 files changed, 50 insertions, 50 deletions

diff --git a/ui/cli/tap-simple_stattable.c b/ui/cli/tap-simple_stattable.c
index 4390d2e98e..3b9ff91815 100644
--- a/ui/cli/tap-simple_stattable.c
+++ b/ui/cli/tap-simple_stattable.c
@@ -19,13 +19,13 @@
 
 typedef struct _table_stat_t {
 	const char *filter;
-	new_stat_data_t stats;
+	stat_data_t stats;
 } table_stat_t;
 
 static void
 simple_draw(void *arg)
 {
-	new_stat_data_t* stat_data = (new_stat_data_t*)arg;
+	stat_data_t* stat_data = (stat_data_t*)arg;
 	table_stat_t* stats = (table_stat_t*)stat_data->user_data;
 	size_t i;
 	guint table_index, element, field_index;
@@ -55,7 +55,7 @@ simple_draw(void *arg)
 		{
 			for (field_index = 0, field = stat_data->stat_tap_data->fields; field_index < table->num_fields; field_index++, field++)
 			{
-				field_data = new_stat_tap_get_field_data(table, element, field_index);
+				field_data = stat_tap_get_field_data(table, element, field_index);
 				if (field_data->type == TABLE_ITEM_NONE) /* Nothing for us here */
 					break;
 
@@ -88,19 +88,19 @@ simple_draw(void *arg)
 }
 
 static void
-init_stat_table(stat_tap_table_ui *new_stat_tap, const char *filter)
+init_stat_table(stat_tap_table_ui *stat_tap, const char *filter)
 {
 	GString *error_string;
 	table_stat_t* ui;
 
 	ui = g_new0(table_stat_t, 1);
 	ui->filter = g_strdup(filter);
-	ui->stats.stat_tap_data = new_stat_tap;
+	ui->stats.stat_tap_data = stat_tap;
 	ui->stats.user_data = ui;
 
-	new_stat_tap->stat_tap_init_cb(new_stat_tap, NULL, NULL);
+	stat_tap->stat_tap_init_cb(stat_tap, NULL, NULL);
 
-	error_string = register_tap_listener(new_stat_tap->tap_name, &ui->stats, filter, 0, NULL, new_stat_tap->packet_func, simple_draw);
+	error_string = register_tap_listener(stat_tap->tap_name, &ui->stats, filter, 0, NULL, stat_tap->packet_func, simple_draw);
 	if (error_string) {
 /*		free_rtd_table(&ui->rtd.stat_table, NULL, NULL); */
 		fprintf(stderr, "tshark: Couldn't register tap: %s\n", error_string->str);
@@ -112,11 +112,11 @@ init_stat_table(stat_tap_table_ui *new_stat_tap, const char *filter)
 static void
 simple_stat_init(const char *opt_arg, void* userdata)
 {
-	stat_tap_table_ui *new_stat_tap = (stat_tap_table_ui*)userdata;
+	stat_tap_table_ui *stat_tap = (stat_tap_table_ui*)userdata;
 	const char *filter=NULL;
 	char* err = NULL;
 
-	new_stat_tap_get_filter(new_stat_tap, opt_arg, &filter, &err);
+	stat_tap_get_filter(stat_tap, opt_arg, &filter, &err);
 	if (err != NULL)
 	{
 		fprintf(stderr, "tshark: %s\n", err);
@@ -124,23 +124,23 @@ simple_stat_init(const char *opt_arg, void* userdata)
 		exit(1);
 	}
 
-	init_stat_table(new_stat_tap, filter);
+	init_stat_table(stat_tap, filter);
 }
 
 gboolean
 register_simple_stat_tables(const void *key, void *value, void *userdata _U_)
 {
-	stat_tap_table_ui *new_stat_tap = (stat_tap_table_ui*)value;
+	stat_tap_table_ui *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.group = stat_tap->group;
+	ui_info.title = stat_tap->title;   /* construct this from the protocol info? */
 	ui_info.cli_string = (char*)key;
 	ui_info.tap_init_cb = simple_stat_init;
-	ui_info.nparams = new_stat_tap->nparams;
-	ui_info.params = new_stat_tap->params;
+	ui_info.nparams = stat_tap->nparams;
+	ui_info.params = stat_tap->params;
 
-	register_stat_tap_ui(&ui_info, new_stat_tap);
+	register_stat_tap_ui(&ui_info, stat_tap);
 	return FALSE;
 }
 
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index dd7c4bec71..c8e5e6f8e9 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -2228,7 +2228,7 @@ main(int argc, char *argv[])
     hostlist_table_set_gui_info(init_hostlist_table);
     srt_table_iterate_tables(register_service_response_tables, NULL);
     rtd_table_iterate_tables(register_response_time_delay_tables, NULL);
-    new_stat_tap_iterate_tables(register_simple_stat_tables, NULL);
+    stat_tap_iterate_tables(register_simple_stat_tables, NULL);
 
     splash_update(RA_EXTCAP, NULL, (gpointer)splash_win);
     extcap_register_preferences();
diff --git a/ui/gtk/simple_stattable.c b/ui/gtk/simple_stattable.c
index 3ab99ca084..bcf7681c37 100644
--- a/ui/gtk/simple_stattable.c
+++ b/ui/gtk/simple_stattable.c
@@ -55,8 +55,8 @@ typedef struct _gtk_simplestat_t {
 typedef struct _simple_stat_t {
 	const char *filter;
 	gtk_simplestat_t_t gtk_data;
-	stat_tap_table_ui *new_stat_tap;
-	new_stat_data_t data;
+	stat_tap_table_ui *stat_tap;
+	stat_data_t data;
 } simple_stat_t;
 
 static void
@@ -66,7 +66,7 @@ win_destroy_cb(GtkWindow *win _U_, gpointer data)
 
 	remove_tap_listener(&ss->data);
 
-    free_stat_tables(ss->new_stat_tap, NULL, NULL);
+    free_stat_tables(ss->stat_tap, NULL, NULL);
 
 	g_free(ss);
 }
@@ -75,7 +75,7 @@ static void
 init_gtk_simple_stat_table(stat_tap_table* stat_table, void* gui_data)
 {
 	guint i;
-	new_stat_data_t* stat_data = (new_stat_data_t*)gui_data;
+	stat_data_t* stat_data = (stat_data_t*)gui_data;
 	simple_stat_t *ss = (simple_stat_t*)stat_data->user_data;
 	stat_column *start_columns = g_new(stat_column, stat_table->num_fields),
 				*columns;
@@ -123,7 +123,7 @@ static void
 simple_stat_draw(void *arg)
 {
 	GtkListStore *store;
-	new_stat_data_t *stats = (new_stat_data_t*)arg;
+	stat_data_t *stats = (stat_data_t*)arg;
 	simple_stat_t *ss = (simple_stat_t*)stats->user_data;
 	stat_tap_table* table;
 	stat_tap_table_item* field;
@@ -141,7 +141,7 @@ simple_stat_draw(void *arg)
 	for (element = 0; element < table->num_elements; element++)
 	{
 		field_index = 0;
-		field_data = new_stat_tap_get_field_data(table, element, field_index);
+		field_data = stat_tap_get_field_data(table, element, field_index);
 		if (field_data->type == TABLE_ITEM_NONE) /* Nothing for us here */
 			continue;
 
@@ -149,7 +149,7 @@ simple_stat_draw(void *arg)
 
 		for (field = stats->stat_tap_data->fields; field_index < table->num_fields; field_index++, field++)
 		{
-			field_data = new_stat_tap_get_field_data(table, element, field_index);
+			field_data = stat_tap_get_field_data(table, element, field_index);
 
 			switch(field_data->type)
 			{
@@ -188,16 +188,16 @@ reset_table_data(stat_tap_table* table _U_, void* gui_data)
 static void
 simple_stat_reset(void *arg)
 {
-	new_stat_data_t *stats = (new_stat_data_t*)arg;
+	stat_data_t *stats = (stat_data_t*)arg;
 	simple_stat_t *ss = (simple_stat_t*)stats->user_data;
 
 	reset_stat_table(stats->stat_tap_data, reset_table_data, &ss->gtk_data);
 
-	set_window_title(ss->gtk_data.win, ss->new_stat_tap->title);
+	set_window_title(ss->gtk_data.win, ss->stat_tap->title);
 }
 
 static void
-init_simple_stat_tables(stat_tap_table_ui *new_stat_tap, const char *filter)
+init_simple_stat_tables(stat_tap_table_ui *stat_tap, const char *filter)
 {
 	simple_stat_t *ss;
 	GString *error_string;
@@ -206,28 +206,28 @@ init_simple_stat_tables(stat_tap_table_ui *new_stat_tap, const char *filter)
 
 	ss = g_new0(simple_stat_t, 1);
 
-	ss->gtk_data.win=dlg_window_new(new_stat_tap->title);  /* transient_for top_level */
+	ss->gtk_data.win=dlg_window_new(stat_tap->title);  /* transient_for top_level */
 	gtk_window_set_destroy_with_parent (GTK_WINDOW(ss->gtk_data.win), TRUE);
 
 	ss->gtk_data.vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
 
-	init_main_stat_window(ss->gtk_data.win, ss->gtk_data.vbox, new_stat_tap->title, filter);
+	init_main_stat_window(ss->gtk_data.win, ss->gtk_data.vbox, stat_tap->title, filter);
 
 	/* init a scrolled window*/
 	ss->gtk_data.scrolled_window = scrolled_window_new(NULL, NULL);
 
 	ss->filter = g_strdup(filter);
-	ss->new_stat_tap = new_stat_tap;
-	ss->data.stat_tap_data = new_stat_tap;
+	ss->stat_tap = stat_tap;
+	ss->data.stat_tap_data = stat_tap;
 	ss->data.user_data = ss;
 
-	new_stat_tap->stat_tap_init_cb(new_stat_tap, init_gtk_simple_stat_table, &ss->data);
+	stat_tap->stat_tap_init_cb(stat_tap, init_gtk_simple_stat_table, &ss->data);
 
-	error_string = register_tap_listener(new_stat_tap->tap_name, &ss->data, filter, 0, simple_stat_reset, new_stat_tap->packet_func, simple_stat_draw);
+	error_string = register_tap_listener(stat_tap->tap_name, &ss->data, filter, 0, simple_stat_reset, stat_tap->packet_func, simple_stat_draw);
 	if(error_string){
 		simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str);
 		g_string_free(error_string, TRUE);
-		free_stat_tables(ss->new_stat_tap, NULL, NULL);
+		free_stat_tables(ss->stat_tap, NULL, NULL);
 		g_free(ss);
 		return;
 	}
@@ -252,11 +252,11 @@ init_simple_stat_tables(stat_tap_table_ui *new_stat_tap, const char *filter)
 static void
 gtk_simple_stat_init(const char *opt_arg, void *userdata)
 {
-	stat_tap_table_ui *new_stat_tap = (stat_tap_table_ui*)userdata;
+	stat_tap_table_ui *stat_tap = (stat_tap_table_ui*)userdata;
 	const char *filter=NULL;
 	char* err;
 
-	new_stat_tap_get_filter(new_stat_tap, opt_arg, &filter, &err);
+	stat_tap_get_filter(stat_tap, opt_arg, &filter, &err);
 
 	if (err != NULL)
 	{
@@ -265,27 +265,27 @@ gtk_simple_stat_init(const char *opt_arg, void *userdata)
 		return;
 	}
 
-	init_simple_stat_tables(new_stat_tap, filter);
+	init_simple_stat_tables(stat_tap, filter);
 }
 
 gboolean register_simple_stat_tables(const void *key, void *value, void *userdata _U_)
 {
-	stat_tap_table_ui *new_stat_tap = (stat_tap_table_ui*)value;
+	stat_tap_table_ui *stat_tap = (stat_tap_table_ui*)value;
 	tap_param_dlg* stat_dlg;
 
 	stat_dlg = g_new(tap_param_dlg, 1);
 
-	stat_dlg->win_title = new_stat_tap->title;
+	stat_dlg->win_title = stat_tap->title;
 	stat_dlg->init_string = (const char*)key;
 	stat_dlg->tap_init_cb = gtk_simple_stat_init;
 	stat_dlg->index = -1;
 
-	stat_dlg->nparams = new_stat_tap->nparams;
-	stat_dlg->params = new_stat_tap->params;
+	stat_dlg->nparams = stat_tap->nparams;
+	stat_dlg->params = stat_tap->params;
 
-	stat_dlg->user_data = new_stat_tap;
+	stat_dlg->user_data = stat_tap;
 
-	register_param_stat(stat_dlg, new_stat_tap->title, new_stat_tap->group);
+	register_param_stat(stat_dlg, stat_tap->title, stat_tap->group);
 	return FALSE;
 }
 
diff --git a/ui/qt/simple_statistics_dialog.cpp b/ui/qt/simple_statistics_dialog.cpp
index 3bdcc29723..5114b4107f 100644
--- a/ui/qt/simple_statistics_dialog.cpp
+++ b/ui/qt/simple_statistics_dialog.cpp
@@ -177,7 +177,7 @@ TapParameterDialog *SimpleStatisticsDialog::createSimpleStatisticsDialog(QWidget
     return new SimpleStatisticsDialog(parent, cf, stu, filter);
 }
 
-void SimpleStatisticsDialog::addMissingRows(struct _new_stat_data_t *stat_data)
+void SimpleStatisticsDialog::addMissingRows(struct _stat_data_t *stat_data)
 {
     // Hierarchy:
     // - tables (GTK+ UI only supports one currently)
@@ -200,7 +200,7 @@ void SimpleStatisticsDialog::addMissingRows(struct _new_stat_data_t *stat_data)
             ti = statsTreeWidget()->topLevelItem(table_idx);
         }
         for (guint element = ti->childCount(); element < st_table->num_elements; element++) {
-            stat_tap_table_item_type* fields = new_stat_tap_get_field_data(st_table, element, 0);
+            stat_tap_table_item_type* fields = stat_tap_get_field_data(st_table, element, 0);
             SimpleStatisticsTreeWidgetItem *ss_ti = new SimpleStatisticsTreeWidgetItem(ti, st_table->num_fields, fields);
             for (int col = 0; col < (int) stu_->nfields; col++) {
                 if (stu_->fields[col].align == TAP_ALIGN_RIGHT) {
@@ -213,7 +213,7 @@ void SimpleStatisticsDialog::addMissingRows(struct _new_stat_data_t *stat_data)
 
 void SimpleStatisticsDialog::tapReset(void *sd_ptr)
 {
-    new_stat_data_t *sd = (new_stat_data_t*) sd_ptr;
+    stat_data_t *sd = (stat_data_t*) sd_ptr;
     SimpleStatisticsDialog *ss_dlg = static_cast<SimpleStatisticsDialog *>(sd->user_data);
     if (!ss_dlg) return;
 
@@ -223,7 +223,7 @@ void SimpleStatisticsDialog::tapReset(void *sd_ptr)
 
 void SimpleStatisticsDialog::tapDraw(void *sd_ptr)
 {
-    new_stat_data_t *sd = (new_stat_data_t*) sd_ptr;
+    stat_data_t *sd = (stat_data_t*) sd_ptr;
     SimpleStatisticsDialog *ss_dlg = static_cast<SimpleStatisticsDialog *>(sd->user_data);
     if (!ss_dlg) return;
 
@@ -245,7 +245,7 @@ void SimpleStatisticsDialog::tapDraw(void *sd_ptr)
 
 void SimpleStatisticsDialog::fillTree()
 {
-    new_stat_data_t stat_data;
+    stat_data_t stat_data;
     stat_data.stat_tap_data = stu_;
     stat_data.user_data = this;
 
diff --git a/ui/qt/simple_statistics_dialog.h b/ui/qt/simple_statistics_dialog.h
index a1fe6929d5..685ca7a4d8 100644
--- a/ui/qt/simple_statistics_dialog.h
+++ b/ui/qt/simple_statistics_dialog.h
@@ -11,7 +11,7 @@
 
 #include "tap_parameter_dialog.h"
 
-struct _new_stat_data_t;
+struct _stat_data_t;
 
 class SimpleStatisticsDialog : public TapParameterDialog
 {
@@ -27,7 +27,7 @@ protected:
      * @param stat_data The table to add.
      */
     // gtk:service_response_table.h:init_srt_table
-    void addMissingRows(struct _new_stat_data_t *stat_data);
+    void addMissingRows(struct _stat_data_t *stat_data);
 
 private:
     struct _stat_tap_table_ui *stu_;