diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2017-06-08 22:16:36 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2017-06-08 21:19:03 +0000 |
| commit | 61fa0081e41d592df0691c0894c3a31e662f1982 (patch) | |
| tree | 3034ce69544d5e684027e67f2546eff9cedc1d62 | |
| parent | bd5991819134fb0568d7b37c886ac79a7ad8366d (diff) | |
| download | wireshark-61fa0081e41d592df0691c0894c3a31e662f1982.tar.gz | |
sharkd: fix a shadow warning when compiling on RHEL/CentOS 6.x
Bug: 13424
Change-Id: I20e474180545d89599c346ad2c5994949d213cb0
Reviewed-on: https://code.wireshark.org/review/22045
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
(cherry picked from commit b347ce62c95c76b840fbb1740912718fde746176)
Reviewed-on: https://code.wireshark.org/review/22046
| -rw-r--r-- | sharkd_session.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sharkd_session.c b/sharkd_session.c index 842c32c5d8..89f1fb815b 100644 --- a/sharkd_session.c +++ b/sharkd_session.c @@ -2115,22 +2115,22 @@ sharkd_session_process_tap(char *buf, const jsmntok_t *tokens, int count) } else if (!strncmp(tok_tap, "nstat:", 6)) { - stat_tap_table_ui *stat = new_stat_tap_by_name(tok_tap + 6); + stat_tap_table_ui *stat_tap = new_stat_tap_by_name(tok_tap + 6); new_stat_data_t *stat_data; - if (!stat) + if (!stat_tap) { fprintf(stderr, "sharkd_session_process_tap() nstat=%s not found\n", tok_tap + 6); continue; } - stat->stat_tap_init_cb(stat, NULL, NULL); + stat_tap->stat_tap_init_cb(stat_tap, NULL, NULL); stat_data = g_new0(new_stat_data_t, 1); - stat_data->stat_tap_data = stat; + stat_data->stat_tap_data = stat_tap; stat_data->user_data = NULL; - tap_error = register_tap_listener(stat->tap_name, stat_data, tap_filter, 0, NULL, stat->packet_func, sharkd_session_process_tap_nstat_cb); + tap_error = register_tap_listener(stat_tap->tap_name, stat_data, tap_filter, 0, NULL, stat_tap->packet_func, sharkd_session_process_tap_nstat_cb); tap_data = stat_data; tap_free = sharkd_session_free_tap_nstat_cb; |