diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/mi/mi-getopt.c | 34 |
2 files changed, 23 insertions, 17 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cdc332a..c971109 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2011-12-16 Andrey Smirnov <andrew.smirnov@gmail.com> + * mi/mi-getopt.c (mi_getopt): Rename `optind' and `optarg' to + `oind' and `oarg', respectively(-Wshadow). + (mi_valid_noargs): Ditto. + +2011-12-16 Andrey Smirnov <andrew.smirnov@gmail.com> + * mi/mi-cmd-var.c (print_varobj): Rename `optind' and `optarg' to `oind' and `oarg', respectively(-Wshadow). diff --git a/gdb/mi/mi-getopt.c b/gdb/mi/mi-getopt.c index 1748688..09fee9b 100644 --- a/gdb/mi/mi-getopt.c +++ b/gdb/mi/mi-getopt.c @@ -26,29 +26,29 @@ int mi_getopt (const char *prefix, int argc, char **argv, const struct mi_opt *opts, - int *optind, char **optarg) + int *oind, char **oarg) { char *arg; const struct mi_opt *opt; /* We assume that argv/argc are ok. */ - if (*optind > argc || *optind < 0) + if (*oind > argc || *oind < 0) internal_error (__FILE__, __LINE__, - _("mi_getopt_long: optind out of bounds")); - if (*optind == argc) + _("mi_getopt_long: oind out of bounds")); + if (*oind == argc) return -1; - arg = argv[*optind]; + arg = argv[*oind]; /* ``--''? */ if (strcmp (arg, "--") == 0) { - *optind += 1; - *optarg = NULL; + *oind += 1; + *oarg = NULL; return -1; } /* End of option list. */ if (arg[0] != '-') { - *optarg = NULL; + *oarg = NULL; return -1; } /* Look the option up. */ @@ -58,17 +58,17 @@ mi_getopt (const char *prefix, continue; if (opt->arg_p) { - /* A non-simple optarg option. */ - if (argc < *optind + 2) + /* A non-simple oarg option. */ + if (argc < *oind + 2) error (_("%s: Option %s requires an argument"), prefix, arg); - *optarg = argv[(*optind) + 1]; - *optind = (*optind) + 2; + *oarg = argv[(*oind) + 1]; + *oind = (*oind) + 2; return opt->index; } else { - *optarg = NULL; - *optind = (*optind) + 1; + *oarg = NULL; + *oind = (*oind) + 1; return opt->index; } } @@ -78,14 +78,14 @@ mi_getopt (const char *prefix, int mi_valid_noargs (const char *prefix, int argc, char **argv) { - int optind = 0; - char *optarg; + int oind = 0; + char *oarg; static const struct mi_opt opts[] = { { 0, 0, 0 } }; - if (mi_getopt (prefix, argc, argv, opts, &optind, &optarg) == -1) + if (mi_getopt (prefix, argc, argv, opts, &oind, &oarg) == -1) return 1; else return 0; |