mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-02-20 21:26:53 +00:00
Code Issues Releases Wiki Activity

perf: sonarcloud warnings about temp objects (#3686)

Browse source 
* perf: sonarcloud warnings about unnecessary temporary objects

* refactor: rename tr_sha1_digest_t::final() as finish()
This commit is contained in:
Charles Kerr 2022-08-20 15:57:32 -05:00 committed by GitHub
parent 4b615572c3
commit 785119f2c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libtransmission/crypto-utils-ccrypto.cc
View file

@ -125,7 +125,7 @@ public:
}
}
[[nodiscard]] tr_sha1_digest_t final() override
[[nodiscard]] tr_sha1_digest_t finish() override
{
auto digest = tr_sha1_digest_t{};
CC_SHA1_Final(reinterpret_cast<unsigned char*>(std::data(digest)), &handle_);
@ -160,7 +160,7 @@ public:
}
}
[[nodiscard]] tr_sha256_digest_t final() override
[[nodiscard]] tr_sha256_digest_t finish() override
{
auto digest = tr_sha256_digest_t{};
CC_SHA256_Final(reinterpret_cast<unsigned char*>(std::data(digest)), &handle_);

4
libtransmission/crypto-utils-cyassl.cc
View file

@ -141,7 +141,7 @@ public:
}
}
[[nodiscard]] tr_sha1_digest_t final() override
[[nodiscard]] tr_sha1_digest_t finish() override
{
auto digest = tr_sha1_digest_t{};
API(ShaFinal)(&handle_, reinterpret_cast<byte*>(std::data(digest)));
@ -176,7 +176,7 @@ public:
}
}
[[nodiscard]] tr_sha256_digest_t final() override
[[nodiscard]] tr_sha256_digest_t finish() override
{
auto digest = tr_sha256_digest_t{};
API(Sha256Final)(&handle_, reinterpret_cast<byte*>(std::data(digest)));

4
libtransmission/crypto-utils-openssl.cc
View file

@ -165,7 +165,7 @@ public:
helper_.update(data, data_length);
}
[[nodiscard]] tr_sha1_digest_t final() override
[[nodiscard]] tr_sha1_digest_t finish() override
{
return helper_.digest<tr_sha1_digest_t>();
}
@ -194,7 +194,7 @@ public:
helper_.update(data, data_length);
}
[[nodiscard]] tr_sha256_digest_t final() override
[[nodiscard]] tr_sha256_digest_t finish() override
{
return helper_.digest<tr_sha256_digest_t>();
}

4
libtransmission/crypto-utils-polarssl.cc
View file

@ -170,7 +170,7 @@ public:
}
}
[[nodiscard]] tr_sha1_digest_t final() override
[[nodiscard]] tr_sha1_digest_t finish() override
{
auto digest = tr_sha1_digest_t{};
auto* const digest_as_uchar = reinterpret_cast<unsigned char*>(std::data(digest));
@ -226,7 +226,7 @@ public:
}
}
[[nodiscard]] tr_sha256_digest_t final() override
[[nodiscard]] tr_sha256_digest_t finish() override
{
auto digest = tr_sha256_digest_t{};
auto* const digest_as_uchar = reinterpret_cast<unsigned char*>(std::data(digest));

8
libtransmission/crypto-utils.h
View file

@ -29,14 +29,14 @@ public:
virtual void clear() = 0;
virtual void add(void const* data, size_t data_length) = 0;
[[nodiscard]] virtual tr_sha1_digest_t final() = 0;
[[nodiscard]] virtual tr_sha1_digest_t finish() = 0;
template<typename... T>
[[nodiscard]] static tr_sha1_digest_t digest(T... args)
{
auto context = tr_sha1::create();
(context->add(std::data(args), std::size(args)), ...);
return context->final();
return context->finish();
}
};
@ -48,14 +48,14 @@ public:
virtual void clear() = 0;
virtual void add(void const* data, size_t data_length) = 0;
[[nodiscard]] virtual tr_sha256_digest_t final() = 0;
[[nodiscard]] virtual tr_sha256_digest_t finish() = 0;
template<typename... T>
[[nodiscard]] static tr_sha256_digest_t digest(T... args)
{
auto context = tr_sha256::create();
(context->add(std::data(args), std::size(args)), ...);
return context->final();
return context->finish();
}
};

2
libtransmission/inout.cc
View file

@ -251,7 +251,7 @@ std::optional<tr_sha1_digest_t> recalculateHash(tr_torrent* tor, tr_piece_index_
bytes_left -= len;
}
return sha->final();
return sha->finish();
}
} // namespace

2
libtransmission/makemeta.cc
View file

@ -247,7 +247,7 @@ bool tr_metainfo_builder::blockingMakeChecksums(tr_error** error)
TR_ASSERT(bufptr - std::data(buf) == (int)piece_size);
TR_ASSERT(left_in_piece == 0);
sha->add(std::data(buf), std::size(buf));
auto const digest = sha->final();
auto const digest = sha->finish();
walk = std::copy(std::begin(digest), std::end(digest), walk);
sha->clear();

2
libtransmission/quark.cc
View file

@ -464,7 +464,7 @@ tr_quark tr_quark_new(std::string_view str)
}
auto const ret = TR_N_KEYS + std::size(my_runtime);
my_runtime.emplace_back(std::string{ str });
my_runtime.emplace_back(str);
return ret;
}

2
libtransmission/torrent-ctor.cc
View file

@ -86,7 +86,7 @@ bool tr_ctorSetMetainfoFromFile(tr_ctor* ctor, std::string_view filename, tr_err
bool tr_ctorSetMetainfoFromFile(tr_ctor* ctor, char const* filename, tr_error** error)
{
return tr_ctorSetMetainfoFromFile(ctor, std::string{ filename != nullptr ? filename : "" }, error);
return tr_ctorSetMetainfoFromFile(ctor, std::string_view{ filename != nullptr ? filename : "" }, error);
}
bool tr_ctorSetMetainfo(tr_ctor* ctor, char const* metainfo, size_t len, tr_error** error)

2
libtransmission/verify.cc
View file

@ -93,7 +93,7 @@ static bool verifyTorrent(tr_torrent* tor, bool const* stopFlag)
/* if we're finishing a piece... */
if (left_in_piece == 0)
{
auto const has_piece = sha->final() == tor->pieceHash(piece);
auto const has_piece = sha->finish() == tor->pieceHash(piece);
if (has_piece || had_piece)
{

2
libtransmission/watchdir-base.h
View file

@ -130,7 +130,7 @@ private:
}
else
{
pending_.emplace(basename, info);
pending_.try_emplace(basename, info);
}
}

4
libtransmission/watchdir.cc
View file

@ -79,7 +79,7 @@ void BaseWatchdir::processFile(std::string_view basename)
tr_logAddDebug(fmt::format("Callback decided to {:s} file '{:s}'", actionToString(action), basename));
if (action == Action::Retry)
{
auto const [iter, added] = pending_.try_emplace(std::string{ basename }, Pending{});
auto const [iter, added] = pending_.try_emplace(std::string{ basename });
auto const now = std::chrono::steady_clock::now();
auto& info = iter->second;
@ -104,7 +104,7 @@ void BaseWatchdir::processFile(std::string_view basename)
}
else if (action == Action::Done)
{
handled_.insert(std::string{ basename });
handled_.emplace(basename);
}
}

2
libtransmission/webseed.cc
View file

@ -515,7 +515,7 @@ void onPartialDataFetched(tr_web::FetchResponse const& web_response)
template<typename OutputIt>
void makeUrl(tr_webseed* w, std::string_view name, OutputIt out)
{
auto const url = w->base_url;
auto const& url = w->base_url;
out = std::copy(std::begin(url), std::end(url), out);