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 /sharkd_session.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 'sharkd_session.c')
| -rw-r--r-- | sharkd_session.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sharkd_session.c b/sharkd_session.c index 06afe91484..972c2225a8 100644 --- a/sharkd_session.c +++ b/sharkd_session.c @@ -267,11 +267,11 @@ sharkd_rtp_match_check(const struct sharkd_rtp_match *req, const packet_info *pi static gboolean sharkd_session_process_info_nstat_cb(const void *key, void *value, void *userdata) { - stat_tap_table_ui *new_stat_tap = (stat_tap_table_ui *) value; + stat_tap_table_ui *stat_tap = (stat_tap_table_ui *) value; int *pi = (int *) userdata; printf("%s{", (*pi) ? "," : ""); - printf("\"name\":\"%s\"", new_stat_tap->title); + printf("\"name\":\"%s\"", stat_tap->title); printf(",\"tap\":\"nstat:%s\"", (const char *) key); printf("}"); @@ -497,7 +497,7 @@ sharkd_session_process_info(void) printf(",\"nstat\":["); i = 0; - new_stat_tap_iterate_tables(sharkd_session_process_info_nstat_cb, &i); + stat_tap_iterate_tables(sharkd_session_process_info_nstat_cb, &i); printf("]"); printf(",\"convs\":["); @@ -1711,7 +1711,7 @@ sharkd_session_free_tap_conv_cb(void *arg) static void sharkd_session_process_tap_nstat_cb(void *arg) { - new_stat_data_t *stat_data = (new_stat_data_t *) arg; + stat_data_t *stat_data = (stat_data_t *) arg; guint i, j, k; printf("{\"tap\":\"nstat:%s\",\"type\":\"nstat\"", stat_data->stat_tap_data->cli_string); @@ -1752,14 +1752,14 @@ sharkd_session_process_tap_nstat_cb(void *arg) { stat_tap_table_item_type *field_data; - field_data = new_stat_tap_get_field_data(table, j, 0); + field_data = stat_tap_get_field_data(table, j, 0); if (field_data == NULL || field_data->type == TABLE_ITEM_NONE) /* Nothing for us here */ continue; printf("%s[", sepa); for (k = 0; k < table->num_fields; k++) { - field_data = new_stat_tap_get_field_data(table, j, k); + field_data = stat_tap_get_field_data(table, j, k); if (k) printf(","); @@ -1805,7 +1805,7 @@ sharkd_session_process_tap_nstat_cb(void *arg) static void sharkd_session_free_tap_nstat_cb(void *arg) { - new_stat_data_t *stat_data = (new_stat_data_t *) arg; + stat_data_t *stat_data = (stat_data_t *) arg; free_stat_tables(stat_data->stat_tap_data, NULL, NULL); } @@ -2364,8 +2364,8 @@ sharkd_session_process_tap(char *buf, const jsmntok_t *tokens, int count) } else if (!strncmp(tok_tap, "nstat:", 6)) { - stat_tap_table_ui *stat_tap = new_stat_tap_by_name(tok_tap + 6); - new_stat_data_t *stat_data; + stat_tap_table_ui *stat_tap = stat_tap_by_name(tok_tap + 6); + stat_data_t *stat_data; if (!stat_tap) { @@ -2375,7 +2375,7 @@ sharkd_session_process_tap(char *buf, const jsmntok_t *tokens, int count) stat_tap->stat_tap_init_cb(stat_tap, NULL, NULL); - stat_data = g_new0(new_stat_data_t, 1); + stat_data = g_new0(stat_data_t, 1); stat_data->stat_tap_data = stat_tap; stat_data->user_data = NULL; |