From 6ced2a50056acbf7caec404a1edfa3b07fa1ac5d Mon Sep 17 00:00:00 2001 From: Thomas Schmucker Date: Wed, 29 Dec 2021 10:48:03 +0100 Subject: feat: remove NULL-checks --- deque.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'deque.c') diff --git a/deque.c b/deque.c index eec6f42..881d1d3 100644 --- a/deque.c +++ b/deque.c @@ -39,7 +39,7 @@ allocate(size_t n, size_t sz) void deque_init(struct deque *d) { - assert(d != NULL); + assert(d); d->map_begin = 0; d->map_end = 0; @@ -48,7 +48,7 @@ deque_init(struct deque *d) // TODO: Error handling d->map = allocate(START_MAP_CAPACITY, sizeof *d->map); - if ( d->map != NULL ) { + if ( d->map ) { d->map_capacity = START_MAP_CAPACITY; for ( size_t i = 0; i != d->map_capacity; ++i ) { @@ -62,7 +62,7 @@ deque_init(struct deque *d) void deque_free(struct deque *d) { - assert(d != NULL); + assert(d); // free all chunks for ( size_t i = 0; i != d->map_capacity; ++i ) { @@ -79,7 +79,7 @@ deque_free(struct deque *d) size_t deque_size(struct deque *d) { - assert(d != NULL); + assert(d); return d->size; } @@ -89,7 +89,7 @@ deque_size(struct deque *d) bool deque_is_empty(struct deque *d) { - assert(d != NULL); + assert(d); return d->map_begin == d->map_end; } @@ -99,7 +99,7 @@ deque_is_empty(struct deque *d) static void grow_map(struct deque *d) { - assert(d != NULL); + assert(d); const size_t capacity = d->map_capacity + d->map_capacity / 2; T ** map = allocate(capacity, sizeof *map); @@ -135,7 +135,7 @@ grow_map(struct deque *d) static void map_append_chunk(struct deque *d) { - assert(d != NULL); + assert(d); size_t next = (d->map_end + 1) % d->map_capacity; @@ -154,7 +154,7 @@ map_append_chunk(struct deque *d) static void map_prepend_chunk(struct deque *d) { - assert(d != NULL); + assert(d); size_t prev = (d->map_begin + d->map_capacity - 1) % d->map_capacity; @@ -173,7 +173,7 @@ map_prepend_chunk(struct deque *d) static void map_remove_front_chunk(struct deque *d) { - assert(d != NULL); + assert(d); if ( d->map_begin == d->map_end ) { return; @@ -192,7 +192,7 @@ map_remove_front_chunk(struct deque *d) static void map_remove_tail_chunk(struct deque *d) { - assert(d != NULL); + assert(d); if ( d->map_begin == d->map_end ) { return; @@ -211,9 +211,9 @@ map_remove_tail_chunk(struct deque *d) bool deque_get_at(struct deque *d, size_t idx, T *data) { - assert(d != NULL); + assert(d); assert(idx < d->size); - assert(data != NULL); + assert(data); if ( idx >= d->size ) { return false; @@ -233,7 +233,7 @@ deque_get_at(struct deque *d, size_t idx, T *data) bool deque_set_at(struct deque *d, size_t idx, T data) { - assert(d != NULL); + assert(d); assert(idx < d->size); if ( idx >= d->size ) { @@ -254,7 +254,7 @@ deque_set_at(struct deque *d, size_t idx, T data) void deque_push_back(struct deque *d, T data) { - assert(d != NULL); + assert(d); const size_t pos = d->offset + d->size; const size_t chunk_off = pos % CHUNK_CAPACITY; @@ -274,7 +274,7 @@ deque_push_back(struct deque *d, T data) void deque_push_front(struct deque *d, T data) { - assert(d != NULL); + assert(d); if ( d->offset == 0 ) { // Im ersten Element ist kein Platz mehr frei! map_prepend_chunk(d); @@ -294,8 +294,8 @@ deque_push_front(struct deque *d, T data) bool deque_pop_back(struct deque *d, T *data) { - assert(d != NULL); - assert(data != NULL); + assert(d); + assert(data); if ( d->size == 0 ) { return false; @@ -321,8 +321,8 @@ deque_pop_back(struct deque *d, T *data) bool deque_pop_front(struct deque *d, T *data) { - assert(d != NULL); - assert(data != NULL); + assert(d); + assert(data); if ( d->size == 0 ) { return false; @@ -348,7 +348,7 @@ deque_pop_front(struct deque *d, T *data) static void deque_show(struct deque *d) { - assert(d != NULL); + assert(d); printf("first: %zu -- last: %zu -- size: %zu -- map_capacity: %zu -- offset: %zu\n", d->map_begin, d->map_end, d->size, d->map_capacity, d->offset); -- cgit v1.3