mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor: fix a -Wshadow warning for a variable named optarg (#2184)

This commit is contained in:
Charles Kerr 2021-11-16 12:31:29 -06:00 committed by GitHub
parent 7344b7e3cb
commit 0fba476917
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cli/cli.cc
View File

@ -214,14 +214,14 @@ static char const* getConfigDir(int argc, char const** argv)
{
int c;
char const* configDir = nullptr;
char const* optarg;
char const* my_optarg;
int const ind = tr_optind;
while ((c = tr_getopt(getUsage(), argc, argv, options, &optarg)) != TR_OPT_DONE)
while ((c = tr_getopt(getUsage(), argc, argv, options, &my_optarg)) != TR_OPT_DONE)
{
if (c == 'g')
{
configDir = optarg;
configDir = my_optarg;
break;
}
}
@ -426,9 +426,9 @@ int tr_main(int argc, char* argv[])
static int parseCommandLine(tr_variant* d, int argc, char const** argv)
{
int c;
char const* optarg;
char const* my_optarg;
while ((c = tr_getopt(getUsage(), argc, argv, options, &optarg)) != TR_OPT_DONE)
while ((c = tr_getopt(getUsage(), argc, argv, options, &my_optarg)) != TR_OPT_DONE)
{
switch (c)
{
@ -441,7 +441,7 @@ static int parseCommandLine(tr_variant* d, int argc, char const** argv)
break;
case 'd':
tr_variantDictAddInt(d, TR_KEY_speed_limit_down, atoi(optarg));
tr_variantDictAddInt(d, TR_KEY_speed_limit_down, atoi(my_optarg));
tr_variantDictAddBool(d, TR_KEY_speed_limit_down_enabled, true);
break;
@ -450,7 +450,7 @@ static int parseCommandLine(tr_variant* d, int argc, char const** argv)
break;
case 'f':
tr_variantDictAddStr(d, TR_KEY_script_torrent_done_filename, optarg);
tr_variantDictAddStr(d, TR_KEY_script_torrent_done_filename, my_optarg);
tr_variantDictAddBool(d, TR_KEY_script_torrent_done_enabled, true);
break;
@ -466,15 +466,15 @@ static int parseCommandLine(tr_variant* d, int argc, char const** argv)
break;
case 'p':
tr_variantDictAddInt(d, TR_KEY_peer_port, atoi(optarg));
tr_variantDictAddInt(d, TR_KEY_peer_port, atoi(my_optarg));
break;
case 't':
tr_variantDictAddInt(d, TR_KEY_peer_socket_tos, atoi(optarg));
tr_variantDictAddInt(d, TR_KEY_peer_socket_tos, atoi(my_optarg));
break;
case 'u':
tr_variantDictAddInt(d, TR_KEY_speed_limit_up, atoi(optarg));
tr_variantDictAddInt(d, TR_KEY_speed_limit_up, atoi(my_optarg));
tr_variantDictAddBool(d, TR_KEY_speed_limit_up_enabled, true);
break;
@ -491,7 +491,7 @@ static int parseCommandLine(tr_variant* d, int argc, char const** argv)
break;
case 'w':
tr_variantDictAddStr(d, TR_KEY_download_dir, optarg);
tr_variantDictAddStr(d, TR_KEY_download_dir, my_optarg);
break;
case 910:
@ -509,7 +509,7 @@ static int parseCommandLine(tr_variant* d, int argc, char const** argv)
case TR_OPT_UNK:
if (torrentPath == nullptr)
{
torrentPath = optarg;
torrentPath = my_optarg;
}
break;