fix: sonarcloud warnings (#2353)
* fix: remove-redundant-cast sonarcloud warning * fix: make type a pointer-to-const sonarcloud warning * fix: use-init-statement sonarcloud warning * fix: use-init-statement sonarcloud warning * fix: extract-assignment-from-expression sonarcloud warning * fix: remove-redundant-cast sonarcloud warning * fix: extract-nested-block-into-method sonarcloud warning
This commit is contained in:
parent
02aa2f46d4
commit
c832f3c18c
|
@ -1055,7 +1055,7 @@ int Session::Impl::add_ctor(tr_ctor* ctor, bool do_prompt, bool do_notify)
|
|||
* don't want to be nagging users to clean up their watch dirs */
|
||||
if (tr_ctorGetSourceFile(ctor) == nullptr || !adding_from_watch_dir_)
|
||||
{
|
||||
signal_add_error.emit(static_cast<ErrorCode>(ERR_ADD_TORRENT_DUP), metainfo->name().c_str());
|
||||
signal_add_error.emit(ERR_ADD_TORRENT_DUP, metainfo->name().c_str());
|
||||
}
|
||||
|
||||
tr_ctorFree(ctor);
|
||||
|
|
|
@ -468,7 +468,7 @@ static void rawToBitfield(tr_bitfield& bitfield, uint8_t const* raw, size_t rawl
|
|||
}
|
||||
}
|
||||
|
||||
static void saveProgress(tr_variant* dict, tr_torrent* tor)
|
||||
static void saveProgress(tr_variant* dict, tr_torrent const* tor)
|
||||
{
|
||||
tr_variant* const prog = tr_variantDictAddDict(dict, TR_KEY_progress, 4);
|
||||
|
||||
|
|
|
@ -2515,8 +2515,7 @@ static void tr_torrentFileCompleted(tr_torrent* tor, tr_file_index_t i)
|
|||
char* sub = nullptr;
|
||||
if (tr_torrentFindFile2(tor, i, &base, &sub, nullptr))
|
||||
{
|
||||
tr_file& file = tor->file(i);
|
||||
if (strcmp(sub, file.name) != 0)
|
||||
if (tr_file& file = tor->file(i); strcmp(sub, file.name) != 0)
|
||||
{
|
||||
auto const oldpath = tr_strvPath(base, sub);
|
||||
auto const newpath = tr_strvPath(base, file.name);
|
||||
|
|
|
@ -146,21 +146,15 @@ void OptionsDialog::reload()
|
|||
switch (add_.type)
|
||||
{
|
||||
case AddData::MAGNET:
|
||||
{
|
||||
auto magnet = add_.magnet.toUtf8();
|
||||
ok = metainfo.parseMagnet({ std::data(magnet), size_t(std::size(magnet)) });
|
||||
ok = metainfo.parseMagnet(add_.magnet.toStdString());
|
||||
break;
|
||||
}
|
||||
|
||||
case AddData::FILENAME:
|
||||
{
|
||||
auto filename = add_.filename.toUtf8();
|
||||
ok = metainfo.parseTorrentFile({ std::data(filename), size_t(std::size(filename)) });
|
||||
ok = metainfo.parseTorrentFile(add_.filename.toStdString());
|
||||
break;
|
||||
}
|
||||
|
||||
case AddData::METAINFO:
|
||||
ok = metainfo.parseBenc({ std::data(add_.metainfo), size_t(std::size(add_.metainfo)) });
|
||||
ok = metainfo.parseBenc(add_.metainfo.toStdString());
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
|
@ -274,8 +274,7 @@ void doScrape(tr_torrent_metainfo const& metainfo)
|
|||
}
|
||||
|
||||
bool matched = false;
|
||||
tr_variant* files = nullptr;
|
||||
if (tr_variantDictFindDict(&top, TR_KEY_files, &files))
|
||||
if (tr_variant* files = nullptr; tr_variantDictFindDict(&top, TR_KEY_files, &files))
|
||||
{
|
||||
size_t child_pos = 0;
|
||||
tr_quark key;
|
||||
|
@ -284,16 +283,18 @@ void doScrape(tr_torrent_metainfo const& metainfo)
|
|||
auto hashsv = std::string_view{ reinterpret_cast<char const*>(std::data(metainfo.infoHash())),
|
||||
std::size(metainfo.infoHash()) };
|
||||
|
||||
while (tr_variantDictChild(files, child_pos++, &key, &val))
|
||||
while (tr_variantDictChild(files, child_pos, &key, &val))
|
||||
{
|
||||
if (hashsv == tr_quark_get_string_view(key))
|
||||
{
|
||||
auto i = int64_t{};
|
||||
auto const seeders = tr_variantDictFindInt(val, TR_KEY_complete, &i) ? int(i) : -1;
|
||||
auto const leechers = tr_variantDictFindInt(val, TR_KEY_incomplete, &i) ? int(i) : -1;
|
||||
printf("%d seeders, %d leechers\n", (int)seeders, (int)leechers);
|
||||
printf("%d seeders, %d leechers\n", seeders, leechers);
|
||||
matched = true;
|
||||
}
|
||||
|
||||
++child_pos;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue