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/dissectors/packet-h225.c | |
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/dissectors/packet-h225.c')
-rw-r--r-- | epan/dissectors/packet-h225.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index efa638308b..9ed0cfb872 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -8021,14 +8021,14 @@ static guint facility_reason_idx[FACILITY_REASONS]; static guint other_idx; -static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data) +static void h225_stat_init(stat_tap_table_ui* new_stat, stat_tap_gui_init_cb gui_callback, void* gui_data) { int num_fields = sizeof(h225_stat_fields)/sizeof(stat_tap_table_item); - stat_tap_table* table = new_stat_tap_init_table("H.225 Messages and Message Reasons", num_fields, 0, NULL, gui_callback, gui_data); + stat_tap_table* table = stat_tap_init_table("H.225 Messages and Message Reasons", num_fields, 0, NULL, gui_callback, gui_data); int row_idx = 0, msg_idx; stat_tap_table_item_type items[sizeof(h225_stat_fields)/sizeof(stat_tap_table_item)]; - new_stat_tap_add_table(new_stat, table); + stat_tap_add_table(new_stat, table); items[MESSAGE_TYPE_COLUMN].type = TABLE_ITEM_STRING; items[COUNT_COLUMN].type = TABLE_ITEM_UINT; @@ -8045,7 +8045,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb : "Unknown RAS message"; ras_msg_idx[msg_idx] = row_idx; - new_stat_tap_init_table_row(table, row_idx, num_fields, items); + stat_tap_init_table_row(table, row_idx, num_fields, items); row_idx++; msg_idx++; } while (h225_RasMessage_vals[msg_idx].strptr); @@ -8059,7 +8059,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb : "Unknown CS message"; cs_msg_idx[msg_idx] = row_idx; - new_stat_tap_init_table_row(table, row_idx, num_fields, items); + stat_tap_init_table_row(table, row_idx, num_fields, items); row_idx++; msg_idx++; } while (T_h323_message_body_vals[msg_idx].strptr); @@ -8073,7 +8073,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb : "Unknown gatekeeper reject reason"; grj_reason_idx[msg_idx] = row_idx; - new_stat_tap_init_table_row(table, row_idx, num_fields, items); + stat_tap_init_table_row(table, row_idx, num_fields, items); row_idx++; msg_idx++; } while (GatekeeperRejectReason_vals[msg_idx].strptr); @@ -8087,7 +8087,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb : "Unknown registration reject reason"; rrj_reason_idx[msg_idx] = row_idx; - new_stat_tap_init_table_row(table, row_idx, num_fields, items); + stat_tap_init_table_row(table, row_idx, num_fields, items); row_idx++; msg_idx++; } while (RegistrationRejectReason_vals[msg_idx].strptr); @@ -8101,7 +8101,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb : "Unknown unregistration request reason"; urq_reason_idx[msg_idx] = row_idx; - new_stat_tap_init_table_row(table, row_idx, num_fields, items); + stat_tap_init_table_row(table, row_idx, num_fields, items); row_idx++; msg_idx++; } while (UnregRequestReason_vals[msg_idx].strptr); @@ -8115,7 +8115,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb : "Unknown unregistration reject reason"; urj_reason_idx[msg_idx] = row_idx; - new_stat_tap_init_table_row(table, row_idx, num_fields, items); + stat_tap_init_table_row(table, row_idx, num_fields, items); row_idx++; msg_idx++; } while (UnregRejectReason_vals[msg_idx].strptr); @@ -8129,7 +8129,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb : "Unknown admission reject reason"; arj_reason_idx[msg_idx] = row_idx; - new_stat_tap_init_table_row(table, row_idx, num_fields, items); + stat_tap_init_table_row(table, row_idx, num_fields, items); row_idx++; msg_idx++; } while (AdmissionRejectReason_vals[msg_idx].strptr); @@ -8143,7 +8143,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb : "Unknown band reject reason"; brj_reason_idx[msg_idx] = row_idx; - new_stat_tap_init_table_row(table, row_idx, num_fields, items); + stat_tap_init_table_row(table, row_idx, num_fields, items); row_idx++; msg_idx++; } while (BandRejectReason_vals[msg_idx].strptr); @@ -8157,7 +8157,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb : "Unknown disengage reason"; drq_reason_idx[msg_idx] = row_idx; - new_stat_tap_init_table_row(table, row_idx, num_fields, items); + stat_tap_init_table_row(table, row_idx, num_fields, items); row_idx++; msg_idx++; } while (DisengageReason_vals[msg_idx].strptr); @@ -8171,7 +8171,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb : "Unknown disengage reject reason"; drj_reason_idx[msg_idx] = row_idx; - new_stat_tap_init_table_row(table, row_idx, num_fields, items); + stat_tap_init_table_row(table, row_idx, num_fields, items); row_idx++; msg_idx++; } while (DisengageRejectReason_vals[msg_idx].strptr); @@ -8185,7 +8185,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb : "Unknown location reject reason"; lrj_reason_idx[msg_idx] = row_idx; - new_stat_tap_init_table_row(table, row_idx, num_fields, items); + stat_tap_init_table_row(table, row_idx, num_fields, items); row_idx++; msg_idx++; } while (LocationRejectReason_vals[msg_idx].strptr); @@ -8199,7 +8199,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb : "Unknown info request nak reason"; irqnak_reason_idx[msg_idx] = row_idx; - new_stat_tap_init_table_row(table, row_idx, num_fields, items); + stat_tap_init_table_row(table, row_idx, num_fields, items); row_idx++; msg_idx++; } while (InfoRequestNakReason_vals[msg_idx].strptr); @@ -8213,7 +8213,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb : "Unknown release complete reason"; rel_cmp_reason_idx[msg_idx] = row_idx; - new_stat_tap_init_table_row(table, row_idx, num_fields, items); + stat_tap_init_table_row(table, row_idx, num_fields, items); row_idx++; msg_idx++; } while (h225_ReleaseCompleteReason_vals[msg_idx].strptr); @@ -8227,21 +8227,21 @@ static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb : "Unknown facility reason"; facility_reason_idx[msg_idx] = row_idx; - new_stat_tap_init_table_row(table, row_idx, num_fields, items); + stat_tap_init_table_row(table, row_idx, num_fields, items); row_idx++; msg_idx++; } while (FacilityReason_vals[msg_idx].strptr); items[MESSAGE_TYPE_COLUMN].value.string_value = "Unknown H.225 message"; - new_stat_tap_init_table_row(table, row_idx, num_fields, items); + stat_tap_init_table_row(table, row_idx, num_fields, items); other_idx = row_idx; } static gboolean h225_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *hpi_ptr) { - new_stat_data_t* stat_data = (new_stat_data_t*)tapdata; + stat_data_t* stat_data = (stat_data_t*)tapdata; const h225_packet_info *hpi = (const h225_packet_info *)hpi_ptr; int tag_idx = -1; int reason_idx = -1; @@ -8329,14 +8329,14 @@ h225_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, if (tag_idx >= 0) { stat_tap_table*table = g_array_index(stat_data->stat_tap_data->tables, stat_tap_table*, 0); - stat_tap_table_item_type* msg_data = new_stat_tap_get_field_data(table, tag_idx, COUNT_COLUMN);; + stat_tap_table_item_type* msg_data = stat_tap_get_field_data(table, tag_idx, COUNT_COLUMN);; msg_data->value.uint_value++; - new_stat_tap_set_field_data(table, tag_idx, COUNT_COLUMN, msg_data); + stat_tap_set_field_data(table, tag_idx, COUNT_COLUMN, msg_data); if (reason_idx >= 0) { - msg_data = new_stat_tap_get_field_data(table, reason_idx, COUNT_COLUMN);; + msg_data = stat_tap_get_field_data(table, reason_idx, COUNT_COLUMN);; msg_data->value.uint_value++; - new_stat_tap_set_field_data(table, reason_idx, COUNT_COLUMN, msg_data); + stat_tap_set_field_data(table, reason_idx, COUNT_COLUMN, msg_data); } return TRUE; @@ -8352,9 +8352,9 @@ h225_stat_reset(stat_tap_table* table) for (element = 0; element < table->num_elements; element++) { - item_data = new_stat_tap_get_field_data(table, element, COUNT_COLUMN); + item_data = stat_tap_get_field_data(table, element, COUNT_COLUMN); item_data->value.uint_value = 0; - new_stat_tap_set_field_data(table, element, COUNT_COLUMN, item_data); + stat_tap_set_field_data(table, element, COUNT_COLUMN, item_data); } } |