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.
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[] =
{
};
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);
}
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[] =
{
};
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);
}
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[] =
{
};
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);
}