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

* mi/mi-main.c (mi_cmd_list_thread_groups): Rename `optind' and 

`optarg' to `oind' and `oarg', respectively(-Wshadow).
(mi_cmd_data_read_memory): Ditto.
(mi_cmd_data_read_memory_bytes): Ditto.
This commit is contained in:
Andrey Smirnov 2011-12-17 06:14:45 +00:00
parent 324478caa7
commit 56934ab1ce
2 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/ChangeLog
View File

@ -1,3 +1,11 @@
2011-12-16 Andrey Smirnov <andrew.smirnov@gmail.com>
* mi/mi-main.c (mi_cmd_list_thread_groups): Rename `optind' and
`optarg' to `oind' and `oarg', respectively(-Wshadow).
(mi_cmd_data_read_memory): Ditto.
(mi_cmd_data_read_memory_bytes): Ditto.
(mi_cmd_data_write_memory): Ditto.
2011-12-16 Andrey Smirnov <andrew.smirnov@gmail.com> 2011-12-16 Andrey Smirnov <andrew.smirnov@gmail.com>
* mi/mi-getopt.c (mi_getopt): Rename `optind' and `optarg' to * mi/mi-getopt.c (mi_getopt): Rename `optind' and `optarg' to

56
gdb/mi/mi-main.c
View File

@ -808,13 +808,13 @@ mi_cmd_list_thread_groups (char *command, char **argv, int argc)
{ 0, 0, 0 } { 0, 0, 0 }
}; };
int optind = 0; int oind = 0;
char *optarg; char *oarg;
while (1) while (1)
{ {
int opt = mi_getopt ("-list-thread-groups", argc, argv, opts, int opt = mi_getopt ("-list-thread-groups", argc, argv, opts,
&optind, &optarg); &oind, &oarg);
if (opt < 0) if (opt < 0)
break; break;
@ -824,9 +824,9 @@ mi_cmd_list_thread_groups (char *command, char **argv, int argc)
available = 1; available = 1;
break; break;
case RECURSE_OPT: case RECURSE_OPT:
if (strcmp (optarg, "0") == 0) if (strcmp (oarg, "0") == 0)
; ;
else if (strcmp (optarg, "1") == 0) else if (strcmp (oarg, "1") == 0)
recurse = 1; recurse = 1;
else else
error (_("only '0' and '1' are valid values " error (_("only '0' and '1' are valid values "
@ -835,18 +835,18 @@ mi_cmd_list_thread_groups (char *command, char **argv, int argc)
} }
} }
for (; optind < argc; ++optind) for (; oind < argc; ++oind)
{ {
char *end; char *end;
int inf; int inf;
if (*(argv[optind]) != 'i') if (*(argv[oind]) != 'i')
error (_("invalid syntax of group id '%s'"), argv[optind]); error (_("invalid syntax of group id '%s'"), argv[oind]);
inf = strtoul (argv[optind] + 1, &end, 0); inf = strtoul (argv[oind] + 1, &end, 0);
if (*end != '\0') if (*end != '\0')
error (_("invalid syntax of group id '%s'"), argv[optind]); error (_("invalid syntax of group id '%s'"), argv[oind]);
VEC_safe_push (int, ids, inf); VEC_safe_push (int, ids, inf);
} }
if (VEC_length (int, ids) > 1) if (VEC_length (int, ids) > 1)
@ -1303,8 +1303,8 @@ mi_cmd_data_read_memory (char *command, char **argv, int argc)
gdb_byte *mbuf; gdb_byte *mbuf;
int nr_bytes; int nr_bytes;
long offset = 0; long offset = 0;
int optind = 0; int oind = 0;
char *optarg; char *oarg;
enum opt enum opt
{ {
OFFSET_OPT OFFSET_OPT
@ -1318,19 +1318,19 @@ mi_cmd_data_read_memory (char *command, char **argv, int argc)
while (1) while (1)
{ {
int opt = mi_getopt ("-data-read-memory", argc, argv, opts, int opt = mi_getopt ("-data-read-memory", argc, argv, opts,
&optind, &optarg); &oind, &oarg);
if (opt < 0) if (opt < 0)
break; break;
switch ((enum opt) opt) switch ((enum opt) opt)
{ {
case OFFSET_OPT: case OFFSET_OPT:
offset = atol (optarg); offset = atol (oarg);
break; break;
} }
} }
argv += optind; argv += oind;
argc -= optind; argc -= oind;
if (argc < 5 || argc > 6) if (argc < 5 || argc > 6)
error (_("-data-read-memory: Usage: " error (_("-data-read-memory: Usage: "
@ -1489,8 +1489,8 @@ mi_cmd_data_read_memory_bytes (char *command, char **argv, int argc)
int ix; int ix;
VEC(memory_read_result_s) *result; VEC(memory_read_result_s) *result;
long offset = 0; long offset = 0;
int optind = 0; int oind = 0;
char *optarg; char *oarg;
enum opt enum opt
{ {
OFFSET_OPT OFFSET_OPT
@ -1504,18 +1504,18 @@ mi_cmd_data_read_memory_bytes (char *command, char **argv, int argc)
while (1) while (1)
{ {
int opt = mi_getopt ("-data-read-memory-bytes", argc, argv, opts, int opt = mi_getopt ("-data-read-memory-bytes", argc, argv, opts,
&optind, &optarg); &oind, &oarg);
if (opt < 0) if (opt < 0)
break; break;
switch ((enum opt) opt) switch ((enum opt) opt)
{ {
case OFFSET_OPT: case OFFSET_OPT:
offset = atol (optarg); offset = atol (oarg);
break; break;
} }
} }
argv += optind; argv += oind;
argc -= optind; argc -= oind;
if (argc != 2) if (argc != 2)
error (_("Usage: [ -o OFFSET ] ADDR LENGTH.")); error (_("Usage: [ -o OFFSET ] ADDR LENGTH."));
@ -1590,8 +1590,8 @@ mi_cmd_data_write_memory (char *command, char **argv, int argc)
void *buffer; void *buffer;
struct cleanup *old_chain; struct cleanup *old_chain;
long offset = 0; long offset = 0;
int optind = 0; int oind = 0;
char *optarg; char *oarg;
enum opt enum opt
{ {
OFFSET_OPT OFFSET_OPT
@ -1605,19 +1605,19 @@ mi_cmd_data_write_memory (char *command, char **argv, int argc)
while (1) while (1)
{ {
int opt = mi_getopt ("-data-write-memory", argc, argv, opts, int opt = mi_getopt ("-data-write-memory", argc, argv, opts,
&optind, &optarg); &oind, &oarg);
if (opt < 0) if (opt < 0)
break; break;
switch ((enum opt) opt) switch ((enum opt) opt)
{ {
case OFFSET_OPT: case OFFSET_OPT:
offset = atol (optarg); offset = atol (oarg);
break; break;
} }
} }
argv += optind; argv += oind;
argc -= optind; argc -= oind;
if (argc != 4) if (argc != 4)
error (_("-data-write-memory: Usage: " error (_("-data-write-memory: Usage: "