diff options
| author | Andrey Smirnov <ndreys@sourceware.org> | 2011-12-17 06:06:49 +0000 |
|---|---|---|
| committer | Andrey Smirnov <ndreys@sourceware.org> | 2011-12-17 06:06:49 +0000 |
| commit | 54dc829719bc3d9d424d2196f811cdde3669cb2d (patch) | |
| tree | 858998c31ba7db487e7d09c27f5c1f05d74e60fe | |
| parent | 006292124eac020743fb95fa4cc4b0de9f9471fb (diff) | |
| download | fsf-binutils-gdb-54dc829719bc3d9d424d2196f811cdde3669cb2d.zip fsf-binutils-gdb-54dc829719bc3d9d424d2196f811cdde3669cb2d.tar.gz fsf-binutils-gdb-54dc829719bc3d9d424d2196f811cdde3669cb2d.tar.bz2 | |
* mi/mi-cmd-var.c (print_varobj): Rename `optind' and `optarg' to
`oind' and `oarg', respectively(-Wshadow).
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/mi/mi-cmd-var.c | 16 |
2 files changed, 13 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index feba95f..cdc332a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 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). + +2011-12-16 Andrey Smirnov <andrew.smirnov@gmail.com> + * mi/mi-cmd-target.c (mi_cmd_target_file_get): Rename `optind' and `optarg' to `oind' and `oarg', respectively(-Wshadow). (mi_cmd_target_file_put): Ditto. diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c index 16fbb85..48f8a7d 100644 --- a/gdb/mi/mi-cmd-var.c +++ b/gdb/mi/mi-cmd-var.c @@ -554,8 +554,8 @@ mi_cmd_var_evaluate_expression (char *command, char **argv, int argc) enum varobj_display_formats format; int formatFound; - int optind; - char *optarg; + int oind; + char *oarg; enum opt { @@ -570,11 +570,11 @@ mi_cmd_var_evaluate_expression (char *command, char **argv, int argc) /* Parse arguments */ format = FORMAT_NATURAL; formatFound = 0; - optind = 0; + oind = 0; while (1) { int opt = mi_getopt ("-var-evaluate-expression", argc, argv, - opts, &optind, &optarg); + opts, &oind, &oarg); if (opt < 0) break; @@ -584,20 +584,20 @@ mi_cmd_var_evaluate_expression (char *command, char **argv, int argc) if (formatFound) error (_("Cannot specify format more than once")); - format = mi_parse_format (optarg); + format = mi_parse_format (oarg); formatFound = 1; break; } } - if (optind >= argc) + if (oind >= argc) error (_("Usage: [-f FORMAT] NAME")); - if (optind < argc - 1) + if (oind < argc - 1) error (_("Garbage at end of command")); /* Get varobj handle, if a valid var obj name was specified */ - var = varobj_get_handle (argv[optind]); + var = varobj_get_handle (argv[oind]); if (formatFound) { |