aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Smirnov <ndreys@sourceware.org>2011-12-17 06:03:21 +0000
committerAndrey Smirnov <ndreys@sourceware.org>2011-12-17 06:03:21 +0000
commit006292124eac020743fb95fa4cc4b0de9f9471fb (patch)
tree1d6357a025a464a8f9738169ef303f4cf3ea084c
parent7082409d2d0df02ba69fa837ecc23dc021fbf4f4 (diff)
downloadgdb-006292124eac020743fb95fa4cc4b0de9f9471fb.zip
gdb-006292124eac020743fb95fa4cc4b0de9f9471fb.tar.gz
gdb-006292124eac020743fb95fa4cc4b0de9f9471fb.tar.bz2
* 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. (mi_cmd_target_file_delete): Ditto.
-rw-r--r--gdb/ChangeLog7
-rw-r--r--gdb/mi/mi-cmd-target.c34
2 files changed, 24 insertions, 17 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ff8e1ee..feba95f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
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.
+ (mi_cmd_target_file_delete): Ditto.
+
+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.
diff --git a/gdb/mi/mi-cmd-target.c b/gdb/mi/mi-cmd-target.c
index 5f18365..e270581 100644
--- a/gdb/mi/mi-cmd-target.c
+++ b/gdb/mi/mi-cmd-target.c
@@ -26,8 +26,8 @@
void
mi_cmd_target_file_get (char *command, char **argv, int argc)
{
- int optind = 0;
- char *optarg;
+ int oind = 0;
+ char *oarg;
const char *remote_file, *local_file;
static const struct mi_opt opts[] =
{
@@ -35,12 +35,12 @@ mi_cmd_target_file_get (char *command, char **argv, int argc)
};
static const char prefix[] = "-target-file-get";
- if (mi_getopt (prefix, argc, argv, opts, &optind, &optarg) != -1
- || optind != argc - 2)
+ if (mi_getopt (prefix, argc, argv, opts, &oind, &oarg) != -1
+ || oind != argc - 2)
error (_("-target-file-get: Usage: REMOTE_FILE LOCAL_FILE"));
- remote_file = argv[optind];
- local_file = argv[optind + 1];
+ remote_file = argv[oind];
+ local_file = argv[oind + 1];
remote_file_get (remote_file, local_file, 0);
}
@@ -50,8 +50,8 @@ mi_cmd_target_file_get (char *command, char **argv, int argc)
void
mi_cmd_target_file_put (char *command, char **argv, int argc)
{
- int optind = 0;
- char *optarg;
+ int oind = 0;
+ char *oarg;
const char *remote_file, *local_file;
static const struct mi_opt opts[] =
{
@@ -59,12 +59,12 @@ mi_cmd_target_file_put (char *command, char **argv, int argc)
};
static const char prefix[] = "-target-file-put";
- if (mi_getopt (prefix, argc, argv, opts, &optind, &optarg) != -1
- || optind != argc - 2)
+ if (mi_getopt (prefix, argc, argv, opts, &oind, &oarg) != -1
+ || oind != argc - 2)
error (_("-target-file-put: Usage: LOCAL_FILE REMOTE_FILE"));
- local_file = argv[optind];
- remote_file = argv[optind + 1];
+ local_file = argv[oind];
+ remote_file = argv[oind + 1];
remote_file_put (local_file, remote_file, 0);
}
@@ -74,8 +74,8 @@ mi_cmd_target_file_put (char *command, char **argv, int argc)
void
mi_cmd_target_file_delete (char *command, char **argv, int argc)
{
- int optind = 0;
- char *optarg;
+ int oind = 0;
+ char *oarg;
const char *remote_file;
static const struct mi_opt opts[] =
{
@@ -83,11 +83,11 @@ mi_cmd_target_file_delete (char *command, char **argv, int argc)
};
static const char prefix[] = "-target-file-delete";
- if (mi_getopt (prefix, argc, argv, opts, &optind, &optarg) != -1
- || optind != argc - 1)
+ if (mi_getopt (prefix, argc, argv, opts, &oind, &oarg) != -1
+ || oind != argc - 1)
error (_("-target-file-delete: Usage: REMOTE_FILE"));
- remote_file = argv[optind];
+ remote_file = argv[oind];
remote_file_delete (remote_file, 0);
}