more clang-tidy fixes

src/net/protocol_buffer.h

@@ -141,10 +141,7 @@ inline bool
 ProtocolBuffer<tmpl_size>::consume(difference_type v) {
   m_position += v;
 
-  if (remaining())
-    return false;
-
-  return true; 
+  return !static_cast<bool>(remaining());
 }
 
 template <uint16_t tmpl_size>

src/net/socket_listen.cc

@@ -37,7 +37,7 @@ socket_listen::open(sa_unique_ptr&& sap, uint16_t first_port, uint16_t last_port
     throw internal_error("socket_listen::open: socket address is inet without v4only flag");
 
   if (first_port == 0 || last_port == 0 || start_port == 0 ||
-      !(first_port <= last_port && first_port <= start_port && start_port <= last_port))
+      first_port > last_port || first_port > start_port || start_port > last_port)
     throw internal_error("socket_listen::open: port range not valid");
 
   int fd = fd_open(open_flags);

src/protocol/handshake.cc

@@ -638,7 +638,7 @@ Handshake::read_port() {
 
 void
 Handshake::read_done() {
-  if (m_readDone != false)
+  if (m_readDone)
     throw internal_error("Handshake::read_done() m_readDone != false.");
 
 //   if (m_peerInfo->supports_extensions() && m_extensions->is_initial_handshake())
@@ -1171,7 +1171,7 @@ void
 Handshake::write_bitfield() {
   const Bitfield* bitfield = m_download->file_list()->bitfield();
 
-  if (m_writeDone != false)
+  if (m_writeDone)
     throw internal_error("Handshake::event_write() m_writeDone != false.");
 
   if (m_writeBuffer.remaining())

src/torrent/connection_manager.cc

@@ -57,9 +57,8 @@ resolve_host(const char* host, int family, int socktype, ConnectionManager::slot
     thread_base::release_global_lock();
 
   rak::address_info* ai;
-  int err;
 
-  if ((err = rak::address_info::get_address_info(host, family, socktype, &ai)) != 0) {
+  if (int err = rak::address_info::get_address_info(host, family, socktype, &ai); err != 0) {
     if (manager->main_thread_main()->is_current())
       thread_base::acquire_global_lock();
 

src/torrent/data/block.h

@@ -163,22 +163,16 @@ Block::Block() :
 
 inline BlockTransfer*
 Block::find(const PeerInfo* p) {
-  BlockTransfer* transfer;
-
-  if ((transfer = find_queued(p)) != NULL)
+  if (auto transfer = find_queued(p))
     return transfer;
-  else
-    return find_transfer(p);
+  return find_transfer(p);
 }
 
 inline const BlockTransfer*
 Block::find(const PeerInfo* p) const {
-  const BlockTransfer* transfer;
-
-  if ((transfer = find_queued(p)) != NULL)
+  if (auto transfer = find_queued(p))
     return transfer;
-  else
-    return find_transfer(p);
+  return find_transfer(p);
 }
 
 inline void

src/torrent/download/choke_queue.cc

@@ -425,7 +425,7 @@ choke_queue::move_connections(choke_queue* src, choke_queue* dest, DownloadMain*
 
 void
 choke_manager_allocate_slots(choke_queue::iterator first, choke_queue::iterator last,
-                             uint32_t max, uint32_t* weights, choke_queue::target_type* target) {
+                             uint32_t max, const uint32_t* weights, choke_queue::target_type* target) {
   // Sorting the connections from the lowest to highest value.
   // TODO:  std::sort(first, last, choke_manager_less);
 

src/torrent/object.h

@@ -247,8 +247,8 @@ class LIBTORRENT_EXPORT Object {
   void                swap_same_type(Object& left, Object& right);
 
  private:
-  inline bool         check(map_type::const_iterator itr, type_type t) const { return itr != _map().end() && itr->second.type() == t; }
-  inline void         check_throw(type_type t) const                         { if (t != type()) throw bencode_error("Wrong object type."); }
+  bool         check(map_type::const_iterator itr, type_type t) const { return itr != _map().end() && itr->second.type() == t; }
+  void         check_throw(type_type t) const                         { if (t != type()) throw bencode_error("Wrong object type."); }
 
   template <typename T> void check_value_throw(const char* err_msg) const;
 

src/torrent/tracker.h

@@ -159,7 +159,7 @@ class LIBTORRENT_EXPORT Tracker {
 
 inline bool
 Tracker::can_request_state() const {
-  return !(is_busy() && latest_event() != EVENT_SCRAPE) && is_usable();
+  return (!is_busy() || latest_event() == EVENT_SCRAPE) && is_usable();
 }
 
 }

src/torrent/utils/thread_base.h

@@ -71,7 +71,7 @@ class LIBTORRENT_EXPORT thread_base {
   slot_void&          slot_do_work()      { return m_slot_do_work; }
   slot_timer&         slot_next_timeout() { return m_slot_next_timeout; }
 
-  static inline int   global_queue_size() { return m_global.waiting; }
+  static int   global_queue_size() { return m_global.waiting; }
 
   static inline void  acquire_global_lock();
   static inline bool  trylock_global_lock();

src/torrent/utils/uri_parser.cc

@@ -42,7 +42,7 @@
 
 #include "rak/string_manip.h"
 
-namespace torrent { namespace utils {
+namespace torrent::utils {
 
 inline bool
 is_unreserved_uri_char(char c) {
@@ -196,4 +196,4 @@ uri_parse_query_str(const char* query, uri_query_state& state) {
   uri_parse_query_str(std::string(query), state);
 }
 
-}}
+}

src/torrent/utils/uri_parser.h

@@ -42,7 +42,7 @@
 #include <torrent/common.h>
 #include <torrent/exceptions.h>
 
-namespace torrent { namespace utils {
+namespace torrent::utils {
 
 typedef std::vector<std::string> uri_resource_list;
 typedef std::vector<std::string> uri_query_list;
@@ -91,6 +91,6 @@ class LIBTORRENT_EXPORT uri_error : public ::torrent::input_error {
   uri_error(const std::string& msg) : ::torrent::input_error(msg) {}
 };
 
-}}
+}
 
 #endif