OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* mi/mi-cmd-disas.c (mi_cmd_disassemble): Rename `optind' and `optarg' 

to `oind' and `oarg', respectively(-Wshadow).
This commit is contained in:
Andrey Smirnov 2011-12-17 05:53:59 +00:00
parent f8c000a26c
commit 81493c6264
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,7 +1,12 @@
2011-12-16 Andrey Smirnov <andrew.smirnov@gmail.com
* mi/mi-cmd-disas.c (mi_cmd_disassemble): Rename `optind' and `optarg'
to `oind' and `oarg', respectively(-Wshadow).
2011-12-16 Andrey Smirnov <andrew.smirnov@gmail.com>
* 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 <tromey@redhat.com>

20
gdb/mi/mi-cmd-disas.c
View File

@ -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 */