From 81493c62643735ec60c8fa7c25c6e473e1942774 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Sat, 17 Dec 2011 05:53:59 +0000 Subject: [PATCH] * mi/mi-cmd-disas.c (mi_cmd_disassemble): Rename `optind' and `optarg' to `oind' and `oarg', respectively(-Wshadow). --- gdb/ChangeLog | 7 ++++++- gdb/mi/mi-cmd-disas.c | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9780c024e6a..ccccb663461 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,7 +1,12 @@ +2011-12-16 Andrey Smirnov * mi/mi-cmd-break.c (mi_cmd_break_insert): Rename `optind' and - `optparg' to `oind' and `oparg', respectively(-Wshadow). + `optparg' to `oind' and `oarg', respectively(-Wshadow). (mi_cmd_break_watch): Ditto. 2011-12-16 Tom Tromey diff --git a/gdb/mi/mi-cmd-disas.c b/gdb/mi/mi-cmd-disas.c index c2e8265f31f..ebf1c88df79 100644 --- a/gdb/mi/mi-cmd-disas.c +++ b/gdb/mi/mi-cmd-disas.c @@ -77,8 +77,8 @@ mi_cmd_disassemble (char *command, char **argv, int argc) struct cleanup *cleanups = make_cleanup (null_cleanup, NULL); /* Options processing stuff. */ - int optind = 0; - char *optarg; + int oind = 0; + char *oarg; enum opt { FILE_OPT, LINE_OPT, NUM_OPT, START_OPT, END_OPT @@ -97,36 +97,36 @@ mi_cmd_disassemble (char *command, char **argv, int argc) while (1) { int opt = mi_getopt ("-data-disassemble", argc, argv, opts, - &optind, &optarg); + &oind, &oarg); if (opt < 0) break; switch ((enum opt) opt) { case FILE_OPT: - file_string = xstrdup (optarg); + file_string = xstrdup (oarg); file_seen = 1; make_cleanup (xfree, file_string); break; case LINE_OPT: - line_num = atoi (optarg); + line_num = atoi (oarg); line_seen = 1; break; case NUM_OPT: - how_many = atoi (optarg); + how_many = atoi (oarg); num_seen = 1; break; case START_OPT: - low = parse_and_eval_address (optarg); + low = parse_and_eval_address (oarg); start_seen = 1; break; case END_OPT: - high = parse_and_eval_address (optarg); + high = parse_and_eval_address (oarg); end_seen = 1; break; } } - argv += optind; - argc -= optind; + argv += oind; + argc -= oind; /* Allow only filename + linenum (with how_many which is not required) OR start_addr + and_addr */ -- 2.30.2