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>

1 files changed, 18 insertions, 18 deletions

diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c
index 6140328a62..ec77d44794 100644
--- a/epan/dissectors/packet-wsp.c
+++ b/epan/dissectors/packet-wsp.c
@@ -5582,17 +5582,17 @@ static stat_tap_table_item wsp_stat_fields[] = {
 static int unknown_pt_idx;
 static int unknown_sc_idx;
 
-static void wsp_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void wsp_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data)
 {
 	int num_fields = sizeof(wsp_stat_fields)/sizeof(stat_tap_table_item);
-	stat_tap_table* pt_table = new_stat_tap_init_table("PDU Types", num_fields, 0, NULL, gui_callback, gui_data);
+	stat_tap_table* pt_table = stat_tap_init_table("PDU Types", num_fields, 0, NULL, gui_callback, gui_data);
 	stat_tap_table_item_type pt_items[sizeof(wsp_stat_fields)/sizeof(stat_tap_table_item)];
-	stat_tap_table* sc_table = new_stat_tap_init_table("Status Codes", num_fields, 0, NULL, gui_callback, gui_data);
+	stat_tap_table* sc_table = stat_tap_init_table("Status Codes", num_fields, 0, NULL, gui_callback, gui_data);
 	stat_tap_table_item_type sc_items[sizeof(wsp_stat_fields)/sizeof(stat_tap_table_item)];
 	int table_idx;
 
-	new_stat_tap_add_table(new_stat, pt_table);
-	new_stat_tap_add_table(new_stat, sc_table);
+	stat_tap_add_table(new_stat, pt_table);
+	stat_tap_add_table(new_stat, sc_table);
 
 	/* Add a row for each PDU type and status code */
 	table_idx = 0;
@@ -5604,12 +5604,12 @@ static void wsp_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
 		pt_items[MESSAGE_TYPE_COLUMN].value.string_value = g_strdup(wsp_vals_pdu_type[table_idx].strptr);
 		pt_items[MESSAGE_TYPE_COLUMN].user_data.uint_value = wsp_vals_pdu_type[table_idx].value;
 
-		new_stat_tap_init_table_row(pt_table, table_idx, num_fields, pt_items);
+		stat_tap_init_table_row(pt_table, table_idx, num_fields, pt_items);
 		table_idx++;
 	}
 	pt_items[MESSAGE_TYPE_COLUMN].value.string_value = g_strdup("Unknown PDU type");
 	pt_items[MESSAGE_TYPE_COLUMN].user_data.uint_value = 0;
-	new_stat_tap_init_table_row(pt_table, table_idx, num_fields, pt_items);
+	stat_tap_init_table_row(pt_table, table_idx, num_fields, pt_items);
 	unknown_pt_idx = table_idx;
 
 	table_idx = 0;
@@ -5621,19 +5621,19 @@ static void wsp_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb
 		sc_items[MESSAGE_TYPE_COLUMN].value.string_value = g_strdup(wsp_vals_status[table_idx].strptr);
 		sc_items[MESSAGE_TYPE_COLUMN].user_data.uint_value = wsp_vals_status[table_idx].value;
 
-		new_stat_tap_init_table_row(sc_table, table_idx, num_fields, sc_items);
+		stat_tap_init_table_row(sc_table, table_idx, num_fields, sc_items);
 		table_idx++;
 	}
 	sc_items[MESSAGE_TYPE_COLUMN].value.string_value = g_strdup("Unknown status code");
 	sc_items[MESSAGE_TYPE_COLUMN].user_data.uint_value = 0;
-	new_stat_tap_init_table_row(sc_table, table_idx, num_fields, sc_items);
+	stat_tap_init_table_row(sc_table, table_idx, num_fields, sc_items);
 	unknown_sc_idx = table_idx;
 }
 
 static gboolean
 wsp_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *wiv_ptr)
 {
-	new_stat_data_t* stat_data = (new_stat_data_t*)tapdata;
+	stat_data_t* stat_data = (stat_data_t*)tapdata;
 	const wsp_info_value_t *value = (const wsp_info_value_t *)wiv_ptr;
 	stat_tap_table *pt_table, *sc_table;
 	guint element;
@@ -5645,7 +5645,7 @@ wsp_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_,
 
 	found = FALSE;
 	for (element = 0; element < pt_table->num_elements; element++) {
-		item_data = new_stat_tap_get_field_data(pt_table, element, MESSAGE_TYPE_COLUMN);
+		item_data = stat_tap_get_field_data(pt_table, element, MESSAGE_TYPE_COLUMN);
 		if (value->pdut == item_data->user_data.uint_value) {
 			found = TRUE;
 			break;
@@ -5654,14 +5654,14 @@ wsp_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_,
 	if (!found) {
 		element = unknown_pt_idx;
 	}
-	item_data = new_stat_tap_get_field_data(pt_table, element, PACKET_COLUMN);
+	item_data = stat_tap_get_field_data(pt_table, element, PACKET_COLUMN);
 	item_data->value.uint_value++;
-	new_stat_tap_set_field_data(pt_table, element, PACKET_COLUMN, item_data);
+	stat_tap_set_field_data(pt_table, element, PACKET_COLUMN, item_data);
 
 	if (value->status_code != 0) {
 		found = FALSE;
 		for (element = 0; element < sc_table->num_elements; element++) {
-			item_data = new_stat_tap_get_field_data(sc_table, element, MESSAGE_TYPE_COLUMN);
+			item_data = stat_tap_get_field_data(sc_table, element, MESSAGE_TYPE_COLUMN);
 			if (value->status_code == (int) item_data->user_data.uint_value) {
 				found = TRUE;
 				break;
@@ -5670,9 +5670,9 @@ wsp_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_,
 		if (!found) {
 			element = unknown_sc_idx;
 		}
-		item_data = new_stat_tap_get_field_data(sc_table, element, PACKET_COLUMN);
+		item_data = stat_tap_get_field_data(sc_table, element, PACKET_COLUMN);
 		item_data->value.uint_value++;
-		new_stat_tap_set_field_data(sc_table, element, PACKET_COLUMN, item_data);
+		stat_tap_set_field_data(sc_table, element, PACKET_COLUMN, item_data);
 	}
 
 	return TRUE;
@@ -5686,9 +5686,9 @@ wsp_stat_reset(stat_tap_table* table)
 
 	for (element = 0; element < table->num_elements; element++)
 	{
-		item_data = new_stat_tap_get_field_data(table, element, PACKET_COLUMN);
+		item_data = stat_tap_get_field_data(table, element, PACKET_COLUMN);
 		item_data->value.uint_value = 0;
-		new_stat_tap_set_field_data(table, element, PACKET_COLUMN, item_data);
+		stat_tap_set_field_data(table, element, PACKET_COLUMN, item_data);
 	}
 }