From 214f0923ba2981649f14ec3761662332df446d9d Mon Sep 17 00:00:00 2001 From: Thomas Schmucker Date: Thu, 30 Dec 2021 11:01:32 +0100 Subject: code cleanup --- arraylist.c | 10 ++++++++-- insertsort | Bin 0 -> 18008 bytes stack.c | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100755 insertsort diff --git a/arraylist.c b/arraylist.c index a8cebb0..cb23e94 100644 --- a/arraylist.c +++ b/arraylist.c @@ -91,6 +91,8 @@ ArrayList_growIfNeeded(struct ArrayList *arrayList) assert(arrayList->array); } + + assert(arrayList->capacity > arrayList->size); } void @@ -111,7 +113,9 @@ ArrayList_insertAt(struct ArrayList *arrayList, size_t idx, T *ptr) ArrayList_growIfNeeded(arrayList); - memmove(&arrayList->array[idx + 1], &arrayList->array[idx], (arrayList->size - idx) * sizeof(arrayList->array[0])); + memmove(&arrayList->array[idx + 1], + &arrayList->array[idx], + (arrayList->size - idx) * sizeof(arrayList->array[0])); arrayList->array[idx] = ptr; ++arrayList->size; } @@ -152,7 +156,9 @@ ArrayList_removeAt(struct ArrayList *arrayList, size_t idx, void clear_func(T *, } #if defined(ARRAYLIST_KEEP_ORDER) - memmove(&arrayList->arrayList[idx], &arrayList->arrayList[idx + 1], (arrayList->size - (idx + 1)) * sizeof(arrayList->arrayList[0])); + memmove(&arrayList->arrayList[idx], + &arrayList->arrayList[idx + 1], + (arrayList->size - (idx + 1)) * sizeof(arrayList->arrayList[0])); #else arrayList->array[idx] = arrayList->array[arrayList->size - 1]; #endif diff --git a/insertsort b/insertsort new file mode 100755 index 0000000..32576ac Binary files /dev/null and b/insertsort differ diff --git a/stack.c b/stack.c index f594775..162324e 100644 --- a/stack.c +++ b/stack.c @@ -47,10 +47,10 @@ stack_push(struct stack *stack, T data) bool stack_pop(struct stack *stack, T *data) { - if ( stack->head != NULL ) { + if ( stack->head ) { struct stack_item *next = stack->head->next; - if ( data != NULL ) { + if ( data ) { *data = stack->head->data; } free(stack->head); -- cgit v1.3