error enum header separate from vecHEADmain

1 files changed, 24 insertions, 29 deletions

diff --git a/src/util/vec.c b/src/util/vec.c
index ff4aebb..a07f350 100644
--- a/src/util/vec.c
+++ b/src/util/vec.c
@@ -1,35 +1,34 @@
+#include <assert.h>
 #include <stddef.h>
 #include <string.h>
 
 #include "vec.h"
 #include "alloc.h"
 
-static LEO_Vec_Error LEO_Vec_grow(LEO_Vec *vec)
+static LEO_Error LEO_Vec_grow(LEO_Vec *vec)
 {
 	size_t new_capacity = vec->capacity
 		* LEO_Vec_GROWTH_FACTOR_NUMER
 		/ LEO_Vec_GROWTH_FACTOR_DENOM;
 
 	if (new_capacity <= vec->capacity)
-		return LEO_Vec_TOO_BIG;
+		return LEO_Error_AllocationFailure;
 
 	vec->capacity = new_capacity;
 	vec->data = vec->allocator.realloc(vec->data,
 					   vec->capacity * vec->item_size);
 
 	if (vec->data == NULL)
-		return LEO_Vec_ALLOCATION_FAILURE;
+		return LEO_Error_AllocationFailure;
 
-	return LEO_Vec_OK;
+	return LEO_Error_Ok;
 }
 
-LEO_Vec_Error LEO_Vec_init(LEO_Vec *vec, size_t item_size,
+LEO_Error LEO_Vec_init(LEO_Vec *vec, size_t item_size,
 			   LEO_Allocator allocator)
 {
-	if (vec == NULL)
-		return LEO_Vec_NULL_VEC_POINTER;
-	if (item_size == 0)
-		return LEO_Vec_INVALID_ITEM_SIZE;
+	assert(vec != NULL);
+	assert(item_size != 0);
 
 	vec->allocator = allocator;
 	vec->item_size = item_size;
@@ -38,9 +37,9 @@ LEO_Vec_Error LEO_Vec_init(LEO_Vec *vec, size_t item_size,
 	vec->data = vec->allocator.alloc(vec->capacity * vec->item_size);
 
 	if (!vec->data)
-		return LEO_Vec_ALLOCATION_FAILURE;
+		return LEO_Error_AllocationFailure;
 
-	return LEO_Vec_OK;
+	return LEO_Error_Ok;
 }
 
 void LEO_Vec_free(LEO_Vec *vec)
@@ -52,47 +51,43 @@ void LEO_Vec_free(LEO_Vec *vec)
 	vec->data = NULL;
 }
 
-LEO_Vec_Error LEO_Vec_push(LEO_Vec *vec, const void *item)
+LEO_Error LEO_Vec_push(LEO_Vec *vec, const void *item)
 {
-	if (vec == NULL)
-		return LEO_Vec_NULL_VEC_POINTER;
-	if (item == NULL)
-		return LEO_Vec_NULL_ITEM_POINTER;
+	assert(vec != NULL);
+	assert(item != NULL);
 
 	if (vec->length >= vec->capacity) {
-		LEO_Vec_Error result = LEO_Vec_grow(vec);
-		if (result != LEO_Vec_OK)
+		LEO_Error result = LEO_Vec_grow(vec);
+		if (result != LEO_Error_Ok)
 			return result;
 	}
 
 	unsigned char *dest = (unsigned char *)vec->data + (vec->length++) * vec->item_size;
 	memcpy(dest, item, vec->item_size);
 
-	return LEO_Vec_OK;
+	return LEO_Error_Ok;
 }
 
-LEO_Vec_Error LEO_Vec_pop(LEO_Vec *vec, void *item)
+LEO_Error LEO_Vec_pop(LEO_Vec *vec, void *item)
 {
-	if (vec == NULL)
-		return LEO_Vec_NULL_VEC_POINTER;
+	assert(vec != NULL);
 	if (vec->length == 0)
-		return LEO_Vec_OUT_OF_BOUNDS;
+		return LEO_Error_OutOfBounds;
 
 	void *src = vec->data + (vec->length--) * vec->item_size;
 	memcpy(item, src, vec->item_size);
 
-	return LEO_Vec_OK;
+	return LEO_Error_Ok;
 }
 
-LEO_Vec_Error LEO_Vec_get(LEO_Vec *vec, size_t i, void *item)
+LEO_Error LEO_Vec_get(LEO_Vec *vec, size_t i, void *item)
 {
-	if (vec == NULL)
-		return LEO_Vec_NULL_VEC_POINTER;
+	assert(vec != NULL);
 	if (i >= vec->length)
-		return LEO_Vec_OUT_OF_BOUNDS;
+		return LEO_Error_OutOfBounds;
 
 	unsigned char *src = (unsigned char *) vec->data + i * vec->item_size;
 	memcpy(item, src, vec->item_size);
 
-	return LEO_Vec_OK;
+	return LEO_Error_Ok;
 }