Stuff.

Author: rakshasa

src/data/chunk_handle.h

@@ -3,6 +3,8 @@
 
 #include "chunk_list_node.h"
 
+#include <cerrno>
+
 namespace torrent {
 
 class ChunkListNode;
@@ -27,7 +29,7 @@ class ChunkHandle {
 
   uint32_t            index() const           { return m_node->index(); }
 
-  static ChunkHandle  from_error(int e)       { ChunkHandle h; h.set_error_number(e); return h; }
+  static ChunkHandle  from_error(int err);
 
 private:
   ChunkListNode*      m_node;
@@ -37,6 +39,16 @@ class ChunkHandle {
   int                 m_errno;
 };
 
+inline ChunkHandle
+ChunkHandle::from_error(int err) {
+  if (err == 0)
+    err = ENOENT;
+
+  ChunkHandle h;
+  h.set_error_number(err);
+  return h;
+}
+
 } // namespace torrent
 
 #endif

src/data/chunk_list.cc

@@ -109,17 +109,15 @@ ChunkList::get(size_type index, get_flags flags) {
       throw internal_error("ChunkList::get(...) called with get_hashing and get_not_hashing flags set.");
 
     if (chunk == nullptr) {
+      int err = errno;
+
       LT_LOG_THIS(DEBUG, "Could not create: memory:%" PRIu64 " block:%" PRIu32 " errno:%i errmsg:%s.",
                   m_manager->memory_usage(),
                   m_manager->memory_block_count(),
-                  errno, std::strerror(errno));
+                  err, std::strerror(err));
 
       m_manager->deallocate(m_chunk_size, allocate_flags | ChunkManager::allocate_revert_log);
-
-      if (errno == 0)
-        return ChunkHandle::from_error(ENOENT);
-
-      return ChunkHandle::from_error(errno);
+      return ChunkHandle::from_error(err);
     }
 
     node->set_chunk(chunk);
@@ -135,12 +133,8 @@ ChunkList::get(size_type index, get_flags flags) {
 
     Chunk* chunk = m_slot_create_chunk(index, prot_flags);
 
-    if (chunk == nullptr) {
-      if (errno == 0)
-        return ChunkHandle::from_error(ENOENT);
-
+    if (chunk == nullptr)
       return ChunkHandle::from_error(errno);
-    }
 
     delete node->chunk();
 

src/data/chunk_list_node.h

@@ -1,10 +1,10 @@
 #ifndef LIBTORRENT_DATA_CHUNK_LIST_NODE_H
 #define LIBTORRENT_DATA_CHUNK_LIST_NODE_H
 
-#include <cinttypes>
-
 #include "torrent/utils/chrono.h"
 
+#include <cinttypes>
+
 namespace torrent {
 
 class Chunk;