Fix clang-tidy issues

Author: Zitrax

src/file_writer.cpp

@@ -76,6 +76,8 @@ bytes FileWriter::read_block(uint32_t offset,
   return data;
 }
 
+namespace {
+
 /**
  * Interface for writing pieces to destination files. Subclasses
  * implements this for single and multi torrents.
@@ -252,6 +254,8 @@ shared_ptr<TorrentDestination> TorrentDestination::create(
   return make_shared<MultiTorrentDestination>(torrent, std::move(logger));
 }
 
+}  // namespace
+
 void FileWriter::write_next_piece() {
   TorrentPiece t_piece;
   {

src/net.cpp

@@ -101,6 +101,10 @@ vector<string> get_host_ip_addresses() {
   return get_host_ip_addresses(asio::ip::host_name());
 }
 
+}  // namespace zit
+
+namespace {
+
 /**
  * When using asio::read_until we need to match multiple markers to handle non
  * standard responses.
@@ -117,7 +121,8 @@ class MatchMarkers {
     for (const auto& marker : m_markers) {
       auto m = std::search(begin, end, std::begin(marker), std::end(marker));
       if (m != end) {
-        return std::make_pair(next(m, numeric_cast<long>(marker.size())), true);
+        return std::make_pair(next(m, zit::numeric_cast<long>(marker.size())),
+                              true);
       }
     }
     return std::make_pair(end, false);
@@ -126,11 +131,11 @@ class MatchMarkers {
  private:
   vector<string> m_markers;
 };
-}  // namespace zit
+}  // namespace
 
 // Need to explicitly mark this as a MatchCondition
 template <>
-struct asio::is_match_condition<zit::MatchMarkers> : public std::true_type {};
+struct asio::is_match_condition<MatchMarkers> : public std::true_type {};
 
 namespace zit {
 

src/socket_test/client.cpp

@@ -20,6 +20,8 @@
 #include "common.hpp"        // NOLINT(misc-include-cleaner)
 #include "logger.hpp"
 
+namespace {
+
 class Connection : public socket_test::ID {
  public:
   explicit Connection(asio::io_context& io_context)
@@ -56,6 +58,8 @@ class Connection : public socket_test::ID {
   asio::ip::tcp::socket m_socket;
 };
 
+}  // namespace
+
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 unsigned socket_test::ID::m_counter = 0;
 

src/socket_test/server.cpp

@@ -21,6 +21,8 @@
 #include "common.hpp"        // NOLINT(misc-include-cleaner)
 #include "logger.hpp"
 
+namespace {
+
 class Connection : public socket_test::ID {
  public:
   explicit Connection(asio::io_context& io_context,
@@ -66,6 +68,8 @@ class Connection : public socket_test::ID {
   asio::ip::tcp::socket m_socket;
 };
 
+}  // namespace
+
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 unsigned socket_test::ID::m_counter = 0;
 

src/torrent.cpp

@@ -18,6 +18,7 @@
 
 #include <fmt/format.h>
 #include <spdlog/common.h>
+#include <asio/error.hpp>
 #include <asio/error_code.hpp>
 #include <asio/io_context.hpp>
 
@@ -551,6 +552,8 @@ Torrent::http_tracker_request(const Url& announce_url, TrackerEvent event) {
   return {true, peers};
 }
 
+namespace {
+
 /**
  * Protocol documented here: https://libtorrent.org/udp_tracker_protocol.html
  *
@@ -828,6 +831,8 @@ class UDPTrackerRequest {
   TimePoint m_last_connection_id{ClockType::time_point::min()};
 };
 
+}  // namespace
+
 std::pair<bool, std::vector<std::shared_ptr<Peer>>>
 Torrent::udp_tracker_request(const Url& announce_url, TrackerEvent event) {
   // FIXME: Replace this with a max size map, that throws out older request
@@ -1291,7 +1296,7 @@ void Torrent::reset_piece(uint32_t piece_id) {
   const scoped_lock lock(m_mutex);
   auto it = m_active_pieces.find(piece_id);
   if (it != m_active_pieces.end()) {
-    it->second->reset();
+    (*it->second).reset();
     m_client_pieces.at(piece_id) = false;
     m_active_pieces.erase(it);
   }