diff --git a/libtransmission/blocklist.cc b/libtransmission/blocklist.cc index 4788bba23..62c43ddb9 100644 --- a/libtransmission/blocklist.cc +++ b/libtransmission/blocklist.cc @@ -581,10 +581,9 @@ void BlocklistFile::assertValidRules(std::vector const& ranges) for (size_t i = 1; i < std::size(ranges_ipv6); ++i) { - auto last_end_address = ranges_ipv6[i - 1].end6_.s6_addr; - auto start_address = ranges_ipv6[i].begin6_.s6_addr; - - TR_ASSERT(memcmp(last_end_address, start_address, sizeof(&start_address)) > 0); + auto const& last_end_address = ranges_ipv6[i - 1].end6_; + auto const& start_address = ranges_ipv6[i].begin6_; + TR_ASSERT(memcmp(&last_end_address, &start_address, sizeof(start_address)) > 0); } } #endif diff --git a/libtransmission/blocklist.h b/libtransmission/blocklist.h index 05c66abaa..0e17c5172 100644 --- a/libtransmission/blocklist.h +++ b/libtransmission/blocklist.h @@ -11,6 +11,7 @@ #include // for size_t #include +#include #include #include #include diff --git a/libtransmission/crypto-utils.h b/libtransmission/crypto-utils.h index d97909632..e1158cb59 100644 --- a/libtransmission/crypto-utils.h +++ b/libtransmission/crypto-utils.h @@ -32,7 +32,7 @@ public: [[nodiscard]] virtual tr_sha1_digest_t finish() = 0; template - [[nodiscard]] static tr_sha1_digest_t digest(T... args) + [[nodiscard]] static tr_sha1_digest_t digest(T const&... args) { auto context = tr_sha1::create(); (context->add(std::data(args), std::size(args)), ...); @@ -51,7 +51,7 @@ public: [[nodiscard]] virtual tr_sha256_digest_t finish() = 0; template - [[nodiscard]] static tr_sha256_digest_t digest(T... args) + [[nodiscard]] static tr_sha256_digest_t digest(T const&... args) { auto context = tr_sha256::create(); (context->add(std::data(args), std::size(args)), ...); diff --git a/utils/show.cc b/utils/show.cc index 422043ee0..2505b3ad4 100644 --- a/utils/show.cc +++ b/utils/show.cc @@ -345,8 +345,8 @@ void doScrape(tr_torrent_metainfo const& metainfo) fflush(stdout); // execute the http scrape - curl_easy_setopt(curl, CURLOPT_URL, scrape_url.c_str()); - curl_easy_setopt(curl, CURLOPT_TIMEOUT, TimeoutSecs); + (void)curl_easy_setopt(curl, CURLOPT_URL, scrape_url.c_str()); + (void)curl_easy_setopt(curl, CURLOPT_TIMEOUT, TimeoutSecs); if (auto const res = curl_easy_perform(curl); res != CURLE_OK) { fmt::print("error: {:s}\n", curl_easy_strerror(res));