Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-24 20:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: replace tr_variant::is_*() with tr_variant::holds_alternative() (#5930)

Browse Source
This commit is contained in:
Charles Kerr
2023-08-21 16:16:54 -05:00
committed by GitHub
parent 5190db57d9
commit 59c638c63d
13 changed files with 182 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
utils/remote.cc
View File

@@ -2404,7 +2404,7 @@ static int flush(char const* rpcurl, tr_variant* benc, Config& config)
static tr_variant* ensure_sset(tr_variant& sset)
{
if (!tr_variantIsEmpty(&sset))
if (sset.has_value())
{
return tr_variantDictFind(&sset, Arguments);
}
@@ -2416,7 +2416,7 @@ static tr_variant* ensure_sset(tr_variant& sset)
static tr_variant* ensure_tset(tr_variant& tset)
{
if (!tr_variantIsEmpty(&tset))
if (tset.has_value())
{
return tr_variantDictFind(&tset, Arguments);
}
@@ -2449,17 +2449,17 @@ static int processArgs(char const* rpcurl, int argc, char const* const* argv, Co
switch (c)
{
case 'a': /* add torrent */
if (!tr_variantIsEmpty(&sset))
if (sset.has_value())
{
status |= flush(rpcurl, &sset, config);
}
if (!tr_variantIsEmpty(&tadd))
if (tadd.has_value())
{
status |= flush(rpcurl, &tadd, config);
}
if (!tr_variantIsEmpty(&tset))
if (tset.has_value())
{
addIdArg(tr_variantDictFind(&tset, Arguments), config);
status |= flush(rpcurl, &tset, config);
@@ -2509,12 +2509,12 @@ static int processArgs(char const* rpcurl, int argc, char const* const* argv, Co
break;
case 't': /* set current torrent */
if (!tr_variantIsEmpty(&tadd))
if (tadd.has_value())
{
status |= flush(rpcurl, &tadd, config);
}
if (!tr_variantIsEmpty(&tset))
if (tset.has_value())
{
addIdArg(tr_variantDictFind(&tset, Arguments), config);
status |= flush(rpcurl, &tset, config);
@@ -2538,7 +2538,7 @@ static int processArgs(char const* rpcurl, int argc, char const* const* argv, Co
break;
case TR_OPT_UNK:
if (!tr_variantIsEmpty(&tadd))
if (tadd.has_value())
{
tr_variant* args = tr_variantDictFind(&tadd, Arguments);
auto const tmp = getEncodedMetainfo(optarg);
@@ -2571,7 +2571,7 @@ static int processArgs(char const* rpcurl, int argc, char const* const* argv, Co
args = tr_variantDictAddDict(&top, Arguments, 0);
fields = tr_variantDictAddList(args, TR_KEY_fields, 0);
if (!tr_variantIsEmpty(&tset))
if (tset.has_value())
{
addIdArg(tr_variantDictFind(&tset, Arguments), config);
status |= flush(rpcurl, &tset, config);
@@ -2943,7 +2943,7 @@ static int processArgs(char const* rpcurl, int argc, char const* const* argv, Co
{
tr_variant* args;
if (!tr_variantIsEmpty(&tadd))
if (tadd.has_value())
{
args = tr_variantDictFind(&tadd, Arguments);
}
@@ -3016,7 +3016,7 @@ static int processArgs(char const* rpcurl, int argc, char const* const* argv, Co
}
else if (c == 961) /* set location */
{
if (!tr_variantIsEmpty(&tadd))
if (tadd.has_value())
{
tr_variant* args = tr_variantDictFind(&tadd, Arguments);
tr_variantDictAddStr(args, TR_KEY_download_dir, optarg);
@@ -3049,7 +3049,7 @@ static int processArgs(char const* rpcurl, int argc, char const* const* argv, Co
}
case 's': /* start */
if (!tr_variantIsEmpty(&tadd))
if (tadd.has_value())
{
tr_variantDictAddBool(tr_variantDictFind(&tadd, TR_KEY_arguments), TR_KEY_paused, false);
}
@@ -3064,7 +3064,7 @@ static int processArgs(char const* rpcurl, int argc, char const* const* argv, Co
break;
case 'S': /* stop */
if (!tr_variantIsEmpty(&tadd))
if (tadd.has_value())
{
tr_variantDictAddBool(tr_variantDictFind(&tadd, TR_KEY_arguments), TR_KEY_paused, true);
}
@@ -3081,7 +3081,7 @@ static int processArgs(char const* rpcurl, int argc, char const* const* argv, Co
case 'w':
{
auto* args = !tr_variantIsEmpty(&tadd) ? tr_variantDictFind(&tadd, TR_KEY_arguments) : ensure_sset(sset);
auto* args = tadd.has_value() ? tr_variantDictFind(&tadd, TR_KEY_arguments) : ensure_sset(sset);
tr_variantDictAddStr(args, TR_KEY_download_dir, optarg);
break;
}
@@ -3126,7 +3126,7 @@ static int processArgs(char const* rpcurl, int argc, char const* const* argv, Co
case 600:
{
if (!tr_variantIsEmpty(&tset))
if (tset.has_value())
{
addIdArg(tr_variantDictFind(&tset, Arguments), config);
status |= flush(rpcurl, &tset, config);
@@ -3142,7 +3142,7 @@ static int processArgs(char const* rpcurl, int argc, char const* const* argv, Co
case 'v':
{
if (!tr_variantIsEmpty(&tset))
if (tset.has_value())
{
addIdArg(tr_variantDictFind(&tset, Arguments), config);
status |= flush(rpcurl, &tset, config);
@@ -3220,18 +3220,18 @@ static int processArgs(char const* rpcurl, int argc, char const* const* argv, Co
}
}
if (!tr_variantIsEmpty(&tadd))
if (tadd.has_value())
{
status |= flush(rpcurl, &tadd, config);
}
if (!tr_variantIsEmpty(&tset))
if (tset.has_value())
{
addIdArg(tr_variantDictFind(&tset, Arguments), config);
status |= flush(rpcurl, &tset, config);
}
if (!tr_variantIsEmpty(&sset))
if (sset.has_value())
{
status |= flush(rpcurl, &sset, config);
}