From ac646f47a263a8bfa40dd4a62b5508da758cdd62 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 12 Oct 2024 15:04:47 +0800 Subject: [PATCH] Avoid shadowing function parameter The function already has a parameter named `result`. Also remove a duplicate variable since it already has a pref pointer at the start of the function. PR #21571. --- src/base/bittorrent/bencoderesumedatastorage.cpp | 1 - src/base/net/geoipmanager.cpp | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/base/bittorrent/bencoderesumedatastorage.cpp b/src/base/bittorrent/bencoderesumedatastorage.cpp index 670f36cc3..1b6adfc96 100644 --- a/src/base/bittorrent/bencoderesumedatastorage.cpp +++ b/src/base/bittorrent/bencoderesumedatastorage.cpp @@ -293,7 +293,6 @@ BitTorrent::LoadResumeDataResult BitTorrent::BencodeResumeDataStorage::loadTorre if (!metadata.isEmpty()) { - const auto *pref = Preferences::instance(); const lt::bdecode_node torentInfoRoot = lt::bdecode(metadata, ec , nullptr, pref->getBdecodeDepthLimit(), pref->getBdecodeTokenLimit()); if (ec) diff --git a/src/base/net/geoipmanager.cpp b/src/base/net/geoipmanager.cpp index 0d0a4c412..423501699 100644 --- a/src/base/net/geoipmanager.cpp +++ b/src/base/net/geoipmanager.cpp @@ -456,15 +456,15 @@ void GeoIPManager::downloadFinished(const DownloadResult &result) Utils::Fs::mkpath(targetPath); const auto path = targetPath / Path(GEODB_FILENAME); - const nonstd::expected result = Utils::IO::saveToFile(path, data); - if (result) + const nonstd::expected saveResult = Utils::IO::saveToFile(path, data); + if (saveResult) { LogMsg(tr("Successfully updated IP geolocation database."), Log::INFO); } else { LogMsg(tr("Couldn't save downloaded IP geolocation database file. Reason: %1") - .arg(result.error()), Log::WARNING); + .arg(saveResult.error()), Log::WARNING); } } else