refactor: make tr_torrentReqIsValid() private (#6620)

libtransmission/peer-msgs.cc

@@ -269,6 +269,39 @@ struct tr_incoming
     std::map<tr_block_index_t, incoming_piece_data> blocks;
 };
 
+[[nodiscard]] bool is_valid_request(tr_torrent const& tor, tr_piece_index_t index, uint32_t offset, uint32_t length)
+{
+    int err = 0;
+
+    if (index >= tor.piece_count())
+    {
+        err = 1;
+    }
+    else if (length < 1)
+    {
+        err = 2;
+    }
+    else if (offset + length > tor.piece_size(index))
+    {
+        err = 3;
+    }
+    else if (length > tr_block_info::BlockSize)
+    {
+        err = 4;
+    }
+    else if (tor.piece_loc(index, offset, length).byte > tor.total_size())
+    {
+        err = 5;
+    }
+
+    if (err != 0)
+    {
+        tr_logAddTraceTor(&tor, fmt::format("index {} offset {} length {} err {}", index, offset, length, err));
+    }
+
+    return err == 0;
+}
+
 class tr_peerMsgsImpl;
 // TODO: make these to be member functions
 ReadState canRead(tr_peerIo* io, void* vmsgs, size_t* piece);
@@ -486,7 +519,7 @@ public:
 
     [[nodiscard]] bool isValidRequest(peer_request const& req) const
     {
-        return tr_torrentReqIsValid(torrent, req.index, req.offset, req.length);
+        return is_valid_request(*torrent, req.index, req.offset, req.length);
     }
 
     void requestBlocks(tr_block_span_t const* block_spans, size_t n_spans) override
@@ -1255,7 +1288,7 @@ ReadResult process_peer_message(tr_peerMsgsImpl* msgs, uint8_t id, MessageReader
         return false;
     }
 
-    if (!tr_torrentReqIsValid(msgs->torrent, req.index, req.offset, req.length))
+    if (!is_valid_request(*msgs->torrent, req.index, req.offset, req.length))
     {
         logtrace(msgs, "rejecting an invalid request.");
         return false;

libtransmission/torrent.cc

@@ -1893,41 +1893,6 @@ uint16_t tr_torrentGetPeerLimit(tr_torrent const* tor)
 
 // ---
 
-bool tr_torrentReqIsValid(tr_torrent const* tor, tr_piece_index_t index, uint32_t offset, uint32_t length)
-{
-    TR_ASSERT(tr_isTorrent(tor));
-
-    int err = 0;
-
-    if (index >= tor->piece_count())
-    {
-        err = 1;
-    }
-    else if (length < 1)
-    {
-        err = 2;
-    }
-    else if (offset + length > tor->piece_size(index))
-    {
-        err = 3;
-    }
-    else if (length > tr_block_info::BlockSize)
-    {
-        err = 4;
-    }
-    else if (tor->piece_loc(index, offset, length).byte > tor->total_size())
-    {
-        err = 5;
-    }
-
-    if (err != 0)
-    {
-        tr_logAddTraceTor(tor, fmt::format("index {} offset {} length {} err {}", index, offset, length, err));
-    }
-
-    return err == 0;
-}
-
 tr_block_span_t tr_torrent::block_span_for_file(tr_file_index_t const file) const noexcept
 {
     auto const [begin_byte, end_byte] = byte_span_for_file(file);

libtransmission/torrent.h

@@ -54,11 +54,6 @@ void tr_torrentFreeInSessionThread(tr_torrent* tor);
 
 void tr_torrentChangeMyPort(tr_torrent* tor);
 
-bool tr_torrentReqIsValid(tr_torrent const* tor, tr_piece_index_t index, uint32_t offset, uint32_t length);
-
-/** save a torrent's .resume file if it's changed since the last time it was saved */
-void tr_torrentSave(tr_torrent* tor);
-
 namespace libtransmission::test
 {