* mi/mi-cmd-env.c (mi_cmd_env_path): Rename `optind' and

`optarg' to `oind' and `oarg', respectively(-Wshadow).
(mi_cmd_env_dir): Ditto.
This commit is contained in:
Andrey Smirnov
2011-12-17 05:58:27 +00:00
parent 81493c6264
commit 7082409d2d
2 changed files with 19 additions and 13 deletions

View File

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

View File

@ -118,9 +118,9 @@ mi_cmd_env_path (char *command, char **argv, int argc)
char *exec_path; char *exec_path;
char *env; char *env;
int reset = 0; int reset = 0;
int optind = 0; int oind = 0;
int i; int i;
char *optarg; char *oarg;
enum opt enum opt
{ {
RESET_OPT RESET_OPT
@ -144,7 +144,7 @@ mi_cmd_env_path (char *command, char **argv, int argc)
while (1) while (1)
{ {
int opt = mi_getopt ("-environment-path", argc, argv, opts, int opt = mi_getopt ("-environment-path", argc, argv, opts,
&optind, &optarg); &oind, &oarg);
if (opt < 0) if (opt < 0)
break; break;
@ -155,8 +155,8 @@ mi_cmd_env_path (char *command, char **argv, int argc)
break; break;
} }
} }
argv += optind; argv += oind;
argc -= optind; argc -= oind;
if (reset) if (reset)
@ -190,9 +190,9 @@ mi_cmd_env_dir (char *command, char **argv, int argc)
{ {
struct ui_out *uiout = current_uiout; struct ui_out *uiout = current_uiout;
int i; int i;
int optind = 0; int oind = 0;
int reset = 0; int reset = 0;
char *optarg; char *oarg;
enum opt enum opt
{ {
RESET_OPT RESET_OPT
@ -216,7 +216,7 @@ mi_cmd_env_dir (char *command, char **argv, int argc)
while (1) while (1)
{ {
int opt = mi_getopt ("-environment-directory", argc, argv, opts, int opt = mi_getopt ("-environment-directory", argc, argv, opts,
&optind, &optarg); &oind, &oarg);
if (opt < 0) if (opt < 0)
break; break;
@ -227,8 +227,8 @@ mi_cmd_env_dir (char *command, char **argv, int argc)
break; break;
} }
} }
argv += optind; argv += oind;
argc -= optind; argc -= oind;
if (reset) if (reset)
{ {