list.c

@@ -4,34 +4,32 @@
 #include "string.h"
 #include "debug.h"
 
+#ifndef LIST_DEFAULT_RESERVE
 #define LIST_DEFAULT_RESERVE 4
+#endif
 
 List list_init(size_t element_size) {
-    return list_with_len(element_size, 0);
-}
-
-List list_with_len(size_t element_size, size_t len) {
     List self = {
         .element_size = element_size,
-        .cap = 0,
+        .cap = LIST_DEFAULT_RESERVE,
         .len = 0,
-        .data = NULL,
+        .data = malloc(element_size * LIST_DEFAULT_RESERVE),
     };
-    if(len != 0) {
-        list_set_len(&self, len);
-        if (self.data == NULL) {
-            LOG_ERROR("Failed to allocate list with starting capacity of %d", LIST_DEFAULT_RESERVE);
-            self.cap = 0;
-        }
+
+    if(self.data == NULL) {
+        LOG_ERROR("Failed to allocate list with starting capacity of %d", LIST_DEFAULT_RESERVE);
+        self.cap = 0;
     }
+
     return self;
 }
 
 List list_copy(const List* source) {
     List self = list_init(source->element_size);
-    list_set_len(&self, source->cap);
+    list_reserve(&self, source->cap);
     if(self.cap > 0) {
         memcpy(self.data, source->data, source->element_size * source->len);
+        self.len = source->len;
     } else {
         LOG_ERROR("Failed to reserve space");
     }
@@ -39,8 +37,8 @@ List list_copy(const List* source) {
 }
 
 void list_empty(List* self) {
-    if(self->data != NULL && self->cap != 0)
-        free(self->data);
+    if(self->data == NULL || self->cap == 0)
+        return;
     self->data = NULL;
     self->cap = 0;
     self->len = 0;
@@ -66,11 +64,6 @@ void list_reserve(List* self, size_t at_least) {
     self->cap = new_cap;
 }
 
-void list_set_len(List* self, size_t len) {
-    list_reserve(self, len);
-    self->len = len;
-}
-
 void* list_at_unchecked(List* self, size_t at) {
     union {
         uint8_t* as_byte;

list.h

@@ -13,12 +13,10 @@ struct List {
 };
 
 extern List list_init(size_t element_size);
-extern List list_with_len(size_t element_size, size_t len);
 extern List list_copy(const List* source);
 extern void list_empty(List* list);
 
 extern void list_reserve(List* self, size_t at_least);
-extern void list_set_len(List* self, size_t len);
 extern void* list_at(List* list, size_t at);
 extern void* list_at_unchecked(List* self, size_t at);
 
@@ -32,7 +30,6 @@ extern void* list_iterator_end(List* self);
 extern size_t list_contains(List* self, void* query);
 
 #define list_from_type(T) list_init(sizeof(T))
-#define list_from_type_with_len(T, __len) list_with_len(sizeof(T), __len)
 #define list_foreach(T, iter, list) for(T iter = list_iterator_begin(list); iter != (T)list_iterator_end(list); ++iter)
 #define list_at_as(T, __list, __i) ((T*)(list_at(__list, __i)))