From b141b10f707c38b8690d83a9e54ae8777619f2eb Mon Sep 17 00:00:00 2001 From: MrGeorgen Date: Sun, 2 Aug 2020 15:43:52 +0200 Subject: [PATCH] macros for function declartion --- include/acl/array.h | 18 ++++++++++++------ include/acl/file.h | 3 ++- include/acl/hashmap.h | 6 ++++-- src/array.c | 12 ++++++------ src/file.c | 3 ++- src/hashmap.c | 18 +++++++++++------- 6 files changed, 37 insertions(+), 23 deletions(-) diff --git a/include/acl/array.h b/include/acl/array.h index b8c3ade..2d31684 100644 --- a/include/acl/array.h +++ b/include/acl/array.h @@ -1,10 +1,16 @@ #ifndef _acl_array_h #define _acl_array_h #include -size_t acl_arraylist_len(void *arraylist); -void acl_arraylist_free(void *arraylist); -void* acl_arraylist_remove(void *arraylist_void, size_t index); -void* acl_arraylist_create(size_t array_size, size_t sizeof_one_element); -void* acl_arraylist_append(void *arraylist_void, void *element_void); -void* acl_arraylist_append_ptr(void *arraylist_void, void **append_element); +#define acl_arraylist_len_d size_t acl_arraylist_len(void *arraylist) +acl_arraylist_len_d; +#define acl_arraylist_free_d void acl_arraylist_free(void *arraylist) +acl_arraylist_free_d; +#define acl_arraylist_remove_d void* acl_arraylist_remove(void *arraylist_void, size_t index) +acl_arraylist_remove_d; +#define acl_arraylist_create_d void* acl_arraylist_create(size_t array_size, size_t sizeof_one_element) +acl_arraylist_create_d; +#define acl_arraylist_append_d void* acl_arraylist_append(void *arraylist_void, void *element) +acl_arraylist_append_d; +#define acl_arraylist_append_ptr_d void* acl_arraylist_append_ptr(void *arraylist_void, void **append_element) +acl_arraylist_append_ptr_d; #endif diff --git a/include/acl/file.h b/include/acl/file.h index b9061ae..92fc17b 100644 --- a/include/acl/file.h +++ b/include/acl/file.h @@ -1,5 +1,6 @@ #ifndef _acl_file_h #define _acl_file_h #include -char* acl_ReadTextFile(const char *filePath, bool *sucess); +#define acl_ReadTextFile_d char* acl_ReadTextFile(const char *filePath, bool *sucess) +acl_ReadTextFile_d; #endif diff --git a/include/acl/hashmap.h b/include/acl/hashmap.h index 70c999c..d9d46f5 100644 --- a/include/acl/hashmap.h +++ b/include/acl/hashmap.h @@ -10,6 +10,8 @@ union acl_hashmap_meta { }; }; /* set keySize to NULL for a dynamic keySize */ -union acl_hashmap_meta* acl_hashmap_create(size_t bucketCount, size_t sizeOneElement, size_t keySize); -void acl_hashmap_put(union acl_hashmap_meta *hashmap_meta, void *key, void *element); +#define acl_hashmap_create_d union acl_hashmap_meta* acl_hashmap_create(size_t bucketCount, size_t sizeOneElement, size_t keySize) +acl_hashmap_create_d; +#define acl_hashmap_put_d void acl_hashmap_put(union acl_hashmap_meta *hashmap_meta, void *key, void *element) +acl_hashmap_put_d; #endif diff --git a/src/array.c b/src/array.c index 4e0cdaf..084a662 100644 --- a/src/array.c +++ b/src/array.c @@ -17,7 +17,7 @@ union arraylist_meta { }; }; -void* acl_arraylist_create(size_t array_size, size_t sizeof_one_element) { +acl_arraylist_create_d { union arraylist_meta *arraylist_new = malloc(array_size * sizeof_one_element + sizeof*arraylist_new); if(arraylist_new == NULL) return NULL; arraylist_new->len = array_size; @@ -26,7 +26,7 @@ void* acl_arraylist_create(size_t array_size, size_t sizeof_one_element) { return arraylist_new+1; } -void* acl_arraylist_append(void *arraylist_void, void *element) { +acl_arraylist_append_d { void *append_pointer; void **element_append = &append_pointer; union arraylist_meta *arraylist = acl_arraylist_append_ptr(arraylist_void, element_append); @@ -35,7 +35,7 @@ void* acl_arraylist_append(void *arraylist_void, void *element) { memcpy(*element_append, element, arraylist->sizeof_one_element); return arraylist + 1; } -void* acl_arraylist_append_ptr(void *arraylist_void, void **append_element) { +acl_arraylist_append_ptr_d { union arraylist_meta *arraylist = arraylist_void; --arraylist; if(arraylist->len == arraylist->cap) { @@ -49,11 +49,11 @@ void* acl_arraylist_append_ptr(void *arraylist_void, void **append_element) { return arraylist + 1; } -void acl_arraylist_free(void *arraylist) { +acl_arraylist_free_d { free((union arraylist_meta*)arraylist-1); } -void* acl_arraylist_remove(void *arraylist_void, size_t index) { +acl_arraylist_remove_d { union arraylist_meta *arraylist = (union arraylist_meta*)arraylist_void - 1; char *arraylist_char = arraylist_void; if(index != arraylist->len - 1) { @@ -67,6 +67,6 @@ void* acl_arraylist_remove(void *arraylist_void, size_t index) { return arraylist; } -size_t acl_arraylist_len(void *arraylist) { +acl_arraylist_len_d { return ((union arraylist_meta*)arraylist - 1)->len; } diff --git a/src/file.c b/src/file.c index 0963fa3..6931a2d 100644 --- a/src/file.c +++ b/src/file.c @@ -1,7 +1,8 @@ #include +#include #include #include -char* acl_ReadTextFile(const char *filePath, bool *sucess){ +acl_ReadTextFile_d { FILE *fp = fopen(filePath, "rb"); size_t lSize; char *buffer; diff --git a/src/hashmap.c b/src/hashmap.c index 00273a7..4af1122 100644 --- a/src/hashmap.c +++ b/src/hashmap.c @@ -53,21 +53,25 @@ size_t acl_hash(void *data, size_t dataSize, size_t bucketBits) { } } -union acl_hashmap_meta* acl_hashmap_create(size_t bucketCount, size_t sizeOneElement, size_t keySize) { +acl_hashmap_create_d { union acl_hashmap_meta *hashmap_meta = malloc(sizeof *hashmap_meta + bucketCount * sizeof(void*)); hashmap_meta->bucketCount = bucketCount; hashmap_meta->sizeOneElement = sizeOneElement; hashmap_meta->keyBits = log2(keySize); void **hashmap_buckets = (void**)(hashmap_meta + 1); - for(size_t i; i < bucketCount; ++i) { - hashmap_buckets[i] = acl_arraylist_create(0, sizeOneElement); + for(size_t i = 0; i < bucketCount; ++i) { + hashmap_buckets[i] = acl_arraylist_create(0, sizeOneElement + sizeof(size_t)); + if(hashmap_buckets[i] == NULL) { + for(size_t j = 0; j < i; ++j) { + acl_arraylist_free(hashmap_buckets[j]); + } + return NULL; + } } return hashmap_meta; } -void acl_hashmap_put(union acl_hashmap_meta *hashmap_meta, void *key, void *element) { +acl_hashmap_put_d { void **hashmap_buckets = (void**)(hashmap_meta + 1); - -} -int main() { + }