From e788fac9fa13b2e5977c27ada03bbe9ff934d9f6 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 20 Feb 2018 14:41:34 -0800 Subject: [PATCH] Squelch some casting-away-constness warnings. If we're constructing the string, assign the pointer to it to a non-const pointer variable, set the stat_tap_ui cli_string member to that variable, and then use the variable to free it when we're done. Don't cast away constness if we don't have to. Change-Id: If3b24dbf1c910e1e6eceb76f2f6a7ae3898315f9 Reviewed-on: https://code.wireshark.org/review/25952 Reviewed-by: Guy Harris --- ui/cli/tap-flow.c | 6 ++++-- ui/cli/tap-follow.c | 6 ++++-- ui/cli/tap-rtd.c | 6 ++++-- ui/cli/tap-simple_stattable.c | 2 +- ui/cli/tap-srt.c | 6 ++++-- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ui/cli/tap-flow.c b/ui/cli/tap-flow.c index 55178fa61f..fffc8bf753 100644 --- a/ui/cli/tap-flow.c +++ b/ui/cli/tap-flow.c @@ -110,17 +110,19 @@ flow_register(const void *key _U_, void *value, void *userdata _U_) register_analysis_t* analysis = (register_analysis_t*)value; stat_tap_ui flow_ui; GString *cmd_str = g_string_new(STR_FLOW); + gchar *cli_string; g_string_append(cmd_str, sequence_analysis_get_name(analysis)); + cli_string = g_string_free(cmd_str, FALSE); flow_ui.group = REGISTER_STAT_GROUP_GENERIC; flow_ui.title = NULL; /* construct this from the protocol info? */ - flow_ui.cli_string = g_string_free(cmd_str, FALSE); + flow_ui.cli_string = cli_string; flow_ui.tap_init_cb = flow_init; flow_ui.nparams = 0; flow_ui.params = NULL; register_stat_tap_ui(&flow_ui, analysis); - g_free((char*)flow_ui.cli_string); + g_free(cli_string); return FALSE; } diff --git a/ui/cli/tap-follow.c b/ui/cli/tap-follow.c index a22d4590b5..bbcfa140b1 100644 --- a/ui/cli/tap-follow.c +++ b/ui/cli/tap-follow.c @@ -486,15 +486,17 @@ follow_register(const void *key _U_, void *value, void *userdata _U_) { register_follow_t *follower = (register_follow_t*)value; stat_tap_ui follow_ui; + gchar *cli_string; + cli_string = follow_get_stat_tap_string(follower); follow_ui.group = REGISTER_STAT_GROUP_GENERIC; follow_ui.title = NULL; /* construct this from the protocol info? */ - follow_ui.cli_string = follow_get_stat_tap_string(follower); + follow_ui.cli_string = cli_string; follow_ui.tap_init_cb = follow_stream; follow_ui.nparams = 0; follow_ui.params = NULL; register_stat_tap_ui(&follow_ui, follower); - g_free((char*)follow_ui.cli_string); + g_free(cli_string); return FALSE; } diff --git a/ui/cli/tap-rtd.c b/ui/cli/tap-rtd.c index 480b239f75..9e9f93b621 100644 --- a/ui/cli/tap-rtd.c +++ b/ui/cli/tap-rtd.c @@ -133,15 +133,17 @@ register_rtd_tables(const void *key _U_, void *value, void *userdata _U_) { register_rtd_t *rtd = (register_rtd_t*)value; stat_tap_ui ui_info; + gchar *cli_string; + cli_string = rtd_table_get_tap_string(rtd); ui_info.group = REGISTER_STAT_GROUP_RESPONSE_TIME; ui_info.title = NULL; /* construct this from the protocol info? */ - ui_info.cli_string = rtd_table_get_tap_string(rtd); + ui_info.cli_string = cli_string; ui_info.tap_init_cb = dissector_rtd_init; ui_info.nparams = 0; ui_info.params = NULL; register_stat_tap_ui(&ui_info, rtd); - g_free((char*)ui_info.cli_string); + g_free(cli_string); return FALSE; } diff --git a/ui/cli/tap-simple_stattable.c b/ui/cli/tap-simple_stattable.c index 3b9ff91815..61f242eb55 100644 --- a/ui/cli/tap-simple_stattable.c +++ b/ui/cli/tap-simple_stattable.c @@ -135,7 +135,7 @@ register_simple_stat_tables(const void *key, void *value, void *userdata _U_) 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.cli_string = (const char *)key; ui_info.tap_init_cb = simple_stat_init; ui_info.nparams = stat_tap->nparams; ui_info.params = stat_tap->params; diff --git a/ui/cli/tap-srt.c b/ui/cli/tap-srt.c index fd881015b6..18224cc60c 100644 --- a/ui/cli/tap-srt.c +++ b/ui/cli/tap-srt.c @@ -154,20 +154,22 @@ register_srt_tables(const void *key _U_, void *value, void *userdata _U_) register_srt_t *srt = (register_srt_t*)value; const char* short_name = proto_get_protocol_short_name(find_protocol_by_id(get_srt_proto_id(srt))); stat_tap_ui ui_info; + gchar *cli_string; /* XXX - CAMEL dissector hasn't been converted over due seemingly different tap packet handling functions. So let the existing TShark CAMEL tap keep its registration */ if (strcmp(short_name, "CAMEL") == 0) return FALSE; + cli_string = srt_table_get_tap_string(srt); ui_info.group = REGISTER_STAT_GROUP_RESPONSE_TIME; ui_info.title = NULL; /* construct this from the protocol info? */ - ui_info.cli_string = srt_table_get_tap_string(srt); + ui_info.cli_string = cli_string; ui_info.tap_init_cb = dissector_srt_init; ui_info.nparams = 0; ui_info.params = NULL; register_stat_tap_ui(&ui_info, srt); - g_free((char*)ui_info.cli_string); + g_free(cli_string); return FALSE; }