1 files changed, 17 insertions, 16 deletions

diff --git a/trackerlogic.c b/trackerlogic.c
index 7c6b7e1..59e9643 100644
--- a/trackerlogic.c
+++ b/trackerlogic.c
@@ -5,16 +5,12 @@
 
 /* System */
 #include <arpa/inet.h>
-#include <errno.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 /* Libowfat */
-#include "array.h"
-#include "byte.h"
 #include "io.h"
 #include "iob.h"
 #include "ip6.h"
@@ -49,30 +45,35 @@ void add_torrent_from_saved_state(ot_hash const hash, ot_time base, size_t down_
   ot_torrent *torrent;
   ot_vector  *torrents_list = mutex_bucket_lock_by_hash(hash);
 
-  if (!accesslist_hashisvalid(hash))
-    return mutex_bucket_unlock_by_hash(hash, 0);
+  if (!accesslist_hashisvalid(hash)) {
+    mutex_bucket_unlock_by_hash(hash, 0);
+    return;
+  }
 
   torrent = vector_find_or_insert(torrents_list, (void *)hash, sizeof(ot_torrent), OT_HASH_COMPARE_SIZE, &exactmatch);
-  if (!torrent || exactmatch)
-    return mutex_bucket_unlock_by_hash(hash, 0);
+  if (!torrent || exactmatch) {
+    mutex_bucket_unlock_by_hash(hash, 0);
+    return;
+  }
 
   /* Create a new torrent entry, then */
-  byte_zero(torrent, sizeof(ot_torrent));
+  memset(torrent, 0, sizeof(ot_torrent));
   memcpy(torrent->hash, hash, sizeof(ot_hash));
 
   if (!(torrent->peer_list6 = malloc(sizeof(ot_peerlist))) || !(torrent->peer_list4 = malloc(sizeof(ot_peerlist)))) {
     vector_remove_torrent(torrents_list, torrent);
-    return mutex_bucket_unlock_by_hash(hash, 0);
+    mutex_bucket_unlock_by_hash(hash, 0);
+    return;
   }
 
-  byte_zero(torrent->peer_list6, sizeof(ot_peerlist));
-  byte_zero(torrent->peer_list4, sizeof(ot_peerlist));
+  memset(torrent->peer_list6, 0, sizeof(ot_peerlist));
+  memset(torrent->peer_list4, 0, sizeof(ot_peerlist));
   torrent->peer_list6->base       = base;
   torrent->peer_list4->base       = base;
   torrent->peer_list6->down_count = down_count;
   torrent->peer_list4->down_count = down_count;
 
-  return mutex_bucket_unlock_by_hash(hash, 1);
+  mutex_bucket_unlock_by_hash(hash, 1);
 }
 
 size_t add_peer_to_torrent_and_return_peers(PROTO_FLAG proto, struct ot_workstruct *ws, size_t amount) {
@@ -102,7 +103,7 @@ size_t add_peer_to_torrent_and_return_peers(PROTO_FLAG proto, struct ot_workstru
 
   if (!exactmatch) {
     /* Create a new torrent entry, then */
-    byte_zero(torrent, sizeof(ot_torrent));
+    memset(torrent, 0, sizeof(ot_torrent));
     memcpy(torrent->hash, *ws->hash, sizeof(ot_hash));
 
     if (!(torrent->peer_list6 = malloc(sizeof(ot_peerlist))) || !(torrent->peer_list4 = malloc(sizeof(ot_peerlist)))) {
@@ -111,8 +112,8 @@ size_t add_peer_to_torrent_and_return_peers(PROTO_FLAG proto, struct ot_workstru
       return 0;
     }
 
-    byte_zero(torrent->peer_list6, sizeof(ot_peerlist));
-    byte_zero(torrent->peer_list4, sizeof(ot_peerlist));
+    memset(torrent->peer_list6, 0, sizeof(ot_peerlist));
+    memset(torrent->peer_list4, 0, sizeof(ot_peerlist));
     delta_torrentcount = 1;
   } else
     clean_single_torrent(torrent);