diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 12 | ||||
| -rw-r--r-- | gdb/mi/mi-cmd-env.c | 20 |
2 files changed, 19 insertions, 13 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ccccb663461..ff8e1ee8639 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -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-env.c (mi_cmd_env_path): Rename `optind' and + `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). + * 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> diff --git a/gdb/mi/mi-cmd-env.c b/gdb/mi/mi-cmd-env.c index d9e5088cdda..eb9e976e341 100644 --- a/gdb/mi/mi-cmd-env.c +++ b/gdb/mi/mi-cmd-env.c @@ -118,9 +118,9 @@ mi_cmd_env_path (char *command, char **argv, int argc) char *exec_path; char *env; int reset = 0; - int optind = 0; + int oind = 0; int i; - char *optarg; + char *oarg; enum opt { RESET_OPT @@ -144,7 +144,7 @@ mi_cmd_env_path (char *command, char **argv, int argc) while (1) { int opt = mi_getopt ("-environment-path", argc, argv, opts, - &optind, &optarg); + &oind, &oarg); if (opt < 0) break; @@ -155,8 +155,8 @@ mi_cmd_env_path (char *command, char **argv, int argc) break; } } - argv += optind; - argc -= optind; + argv += oind; + argc -= oind; if (reset) @@ -190,9 +190,9 @@ mi_cmd_env_dir (char *command, char **argv, int argc) { struct ui_out *uiout = current_uiout; int i; - int optind = 0; + int oind = 0; int reset = 0; - char *optarg; + char *oarg; enum opt { RESET_OPT @@ -216,7 +216,7 @@ mi_cmd_env_dir (char *command, char **argv, int argc) while (1) { int opt = mi_getopt ("-environment-directory", argc, argv, opts, - &optind, &optarg); + &oind, &oarg); if (opt < 0) break; @@ -227,8 +227,8 @@ mi_cmd_env_dir (char *command, char **argv, int argc) break; } } - argv += optind; - argc -= optind; + argv += oind; + argc -= oind; if (reset) { |