diff options
| author | Dario Lombardo <lomato@gmail.com> | 2016-03-31 14:08:20 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-04-01 00:33:09 +0000 |
| commit | c119296504b5258f9e44e23b298ea6b6394d6d92 (patch) | |
| tree | 2b5d552303cf37c7766d1bcf8821e8c75f5c6ff9 /extcap | |
| parent | f4bdaf9d15c2b4a8abd6e73389356af2aaa4bf99 (diff) | |
randpkt: restyle the list generation to get rid of the const compiler warning.
Change-Id: Id7c62ef18f919ba8a476898bc88c02fd3b6bf5a1
Reviewed-on: https://code.wireshark.org/review/14730
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'extcap')
| -rw-r--r-- | extcap/randpktdump.c | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/extcap/randpktdump.c b/extcap/randpktdump.c index 663f7d3444..da474ce930 100644 --- a/extcap/randpktdump.c +++ b/extcap/randpktdump.c @@ -65,10 +65,9 @@ static struct option longopts[] = { static void help(const char* binname) { - unsigned i; - const char** abbrev_list; - const char** longname_list; - unsigned list_num; + unsigned i = 0; + char** abbrev_list; + char** longname_list; printf("Help\n"); printf(" Usage:\n"); @@ -94,22 +93,23 @@ static void help(const char* binname) printf(" --all-random: a random type is chosen for each packet\n"); printf(" --type <type>: the packet type\n"); printf("\n\nPacket types:\n"); - randpkt_example_list(&abbrev_list, &longname_list, &list_num); - for (i = 0; i < list_num; i++) { + randpkt_example_list(&abbrev_list, &longname_list); + while (abbrev_list[i] && longname_list[i]) { printf("\t%-16s%s\n", abbrev_list[i], longname_list[i]); + i++; } - g_free((char**)abbrev_list); - g_free((char**)longname_list); + printf("\n"); + g_strfreev(abbrev_list); + g_strfreev(longname_list); } static int list_config(char *interface) { unsigned inc = 0; - unsigned i; - const char** abbrev_list; - const char** longname_list; - unsigned list_num; + unsigned i = 0; + char** abbrev_list; + char** longname_list; if (!interface) { errmsg_print("ERROR: No interface specified."); @@ -138,12 +138,13 @@ static int list_config(char *interface) printf("arg {number=%u}{call=--type}{display=Type of packet}" "{type=selector}{tooltip=Type of packet to generate}\n", inc); - randpkt_example_list(&abbrev_list, &longname_list, &list_num); - for (i = 0; i < list_num; i++) { + randpkt_example_list(&abbrev_list, &longname_list); + while (abbrev_list[i] && longname_list[i]) { printf("value {arg=%u}{value=%s}{display=%s}\n", inc, abbrev_list[i], longname_list[i]); + i++; } - g_free((char**)abbrev_list); - g_free((char**)longname_list); + g_strfreev(abbrev_list); + g_strfreev(longname_list); inc++; return EXIT_SUCCESS; |