1 files changed, 8 insertions, 8 deletions

diff --git a/ot_vector.c b/ot_vector.c
index d068999..e3c3d3f 100644
--- a/ot_vector.c
+++ b/ot_vector.c
@@ -13,10 +13,6 @@
 /* Opentracker */
 #include "trackerlogic.h"
 
-/* Libowfat */
-#include "uint16.h"
-#include "uint32.h"
-
 static int vector_compare_peer6(const void *peer1, const void *peer2) { return memcmp(peer1, peer2, OT_PEER_COMPARE_SIZE6); }
 static int vector_compare_peer4(const void *peer1, const void *peer2) { return memcmp(peer1, peer2, OT_PEER_COMPARE_SIZE4); }
 
@@ -222,8 +218,10 @@ void vector_redistribute_buckets(ot_peerlist *peer_list, size_t peer_size) {
   for (bucket = 0; bucket < num_buckets_new; ++bucket) {
     bucket_list_new[bucket].space = bucket_size_new;
     bucket_list_new[bucket].data  = malloc(bucket_size_new * peer_size);
-    if (!bucket_list_new[bucket].data)
-      return vector_clean_list(bucket_list_new, num_buckets_new);
+    if (!bucket_list_new[bucket].data) {
+      vector_clean_list(bucket_list_new, num_buckets_new);
+      return;
+    }
   }
 
   /* Now sort them into the correct bucket */
@@ -236,8 +234,10 @@ void vector_redistribute_buckets(ot_peerlist *peer_list, size_t peer_size) {
         bucket_dest += vector_hash_peer(peers_old, OT_PEER_COMPARE_SIZE_FROM_PEER_SIZE(peer_size), num_buckets_new);
       if (bucket_dest->size + 1 > bucket_dest->space) {
         void *tmp = realloc(bucket_dest->data, peer_size * OT_VECTOR_GROW_RATIO * bucket_dest->space);
-        if (!tmp)
-          return vector_clean_list(bucket_list_new, num_buckets_new);
+        if (!tmp) {
+          vector_clean_list(bucket_list_new, num_buckets_new);
+          return;
+        }
         bucket_dest->data   = tmp;
         bucket_dest->space *= OT_VECTOR_GROW_RATIO;
       }