--- a/src/linked_list.c Wed Sep 18 00:02:18 2024 +0200
+++ b/src/linked_list.c Sat Sep 28 15:47:28 2024 +0200
@@ -41,7 +41,7 @@
#define ll_data(node) (((char*)(node))+loc_data)
void *cx_linked_list_at(
- void const *start,
+ const void *start,
size_t start_index,
ptrdiff_t loc_advance,
size_t index
@@ -49,7 +49,7 @@
assert(start != NULL);
assert(loc_advance >= 0);
size_t i = start_index;
- void const *cur = start;
+ const void *cur = start;
while (i != index && cur != NULL) {
cur = ll_advance(cur);
i < index ? i++ : i--;
@@ -58,11 +58,11 @@
}
ssize_t cx_linked_list_find(
- void const *start,
+ const void *start,
ptrdiff_t loc_advance,
ptrdiff_t loc_data,
cx_compare_func cmp_func,
- void const *elem
+ const void *elem
) {
void *dummy;
return cx_linked_list_find_node(
@@ -74,11 +74,11 @@
ssize_t cx_linked_list_find_node(
void **result,
- void const *start,
+ const void *start,
ptrdiff_t loc_advance,
ptrdiff_t loc_data,
cx_compare_func cmp_func,
- void const *elem
+ const void *elem
) {
assert(result != NULL);
assert(start != NULL);
@@ -86,7 +86,7 @@
assert(loc_data >= 0);
assert(cmp_func);
- void const *node = start;
+ const void *node = start;
ssize_t index = 0;
do {
void *current = ll_data(node);
@@ -102,21 +102,21 @@
}
void *cx_linked_list_first(
- void const *node,
+ const void *node,
ptrdiff_t loc_prev
) {
return cx_linked_list_last(node, loc_prev);
}
void *cx_linked_list_last(
- void const *node,
+ const void *node,
ptrdiff_t loc_next
) {
assert(node != NULL);
assert(loc_next >= 0);
- void const *cur = node;
- void const *last;
+ const void *cur = node;
+ const void *last;
do {
last = cur;
} while ((cur = ll_next(cur)) != NULL);
@@ -125,16 +125,16 @@
}
void *cx_linked_list_prev(
- void const *begin,
+ const void *begin,
ptrdiff_t loc_next,
- void const *node
+ const void *node
) {
assert(begin != NULL);
assert(node != NULL);
assert(loc_next >= 0);
if (begin == node) return NULL;
- void const *cur = begin;
- void const *next;
+ const void *cur = begin;
+ const void *next;
while (1) {
next = ll_next(cur);
if (next == node) return (void *) cur;
@@ -376,7 +376,7 @@
}
size_t cx_linked_list_size(
- void const *node,
+ const void *node,
ptrdiff_t loc_next
) {
assert(loc_next >= 0);
@@ -514,17 +514,17 @@
}
int cx_linked_list_compare(
- void const *begin_left,
- void const *begin_right,
+ const void *begin_left,
+ const void *begin_right,
ptrdiff_t loc_advance,
ptrdiff_t loc_data,
cx_compare_func cmp_func
) {
- void const *left = begin_left, *right = begin_right;
+ const void *left = begin_left, *right = begin_right;
while (left != NULL && right != NULL) {
- void const *left_data = ll_data(left);
- void const *right_data = ll_data(right);
+ const void *left_data = ll_data(left);
+ const void *right_data = ll_data(right);
int result = cmp_func(left_data, right_data);
if (result != 0) return result;
left = ll_advance(left);
@@ -587,7 +587,7 @@
} cx_linked_list;
static cx_linked_list_node *cx_ll_node_at(
- cx_linked_list const *list,
+ const cx_linked_list *list,
size_t index
) {
if (index >= list->base.collection.size) {
@@ -599,7 +599,7 @@
}
}
-static cx_linked_list_node *cx_ll_malloc_node(struct cx_list_s const *list) {
+static cx_linked_list_node *cx_ll_malloc_node(const struct cx_list_s *list) {
return cxMalloc(list->collection.allocator,
sizeof(cx_linked_list_node) + list->collection.elem_size);
}
@@ -607,7 +607,7 @@
static int cx_ll_insert_at(
struct cx_list_s *list,
cx_linked_list_node *node,
- void const *elem
+ const void *elem
) {
// create the new new_node
@@ -636,7 +636,7 @@
static size_t cx_ll_insert_array(
struct cx_list_s *list,
size_t index,
- void const *array,
+ const void *array,
size_t n
) {
// out-of bounds and corner case check
@@ -657,7 +657,7 @@
node = node == NULL ? ((cx_linked_list *) list)->begin : node->next;
// we can add the remaining nodes and immediately advance to the inserted node
- char const *source = array;
+ const char *source = array;
for (size_t i = 1; i < n; i++) {
source += list->collection.elem_size;
if (0 != cx_ll_insert_at(list, node, source)) {
@@ -671,22 +671,22 @@
static int cx_ll_insert_element(
struct cx_list_s *list,
size_t index,
- void const *element
+ const void *element
) {
return 1 != cx_ll_insert_array(list, index, element, 1);
}
static _Thread_local cx_compare_func cx_ll_insert_sorted_cmp_func;
-static int cx_ll_insert_sorted_cmp_helper(void const *l, void const *r) {
- cx_linked_list_node const *left = l;
- cx_linked_list_node const *right = r;
+static int cx_ll_insert_sorted_cmp_helper(const void *l, const void *r) {
+ const cx_linked_list_node *left = l;
+ const cx_linked_list_node *right = r;
return cx_ll_insert_sorted_cmp_func(left->payload, right->payload);
}
static size_t cx_ll_insert_sorted(
struct cx_list_s *list,
- void const *array,
+ const void *array,
size_t n
) {
// special case
@@ -702,7 +702,7 @@
// add all elements from the array to that chain
cx_linked_list_node *prev = chain;
- char const *src = array;
+ const char *src = array;
size_t inserted = 1;
for (; inserted < n; inserted++) {
cx_linked_list_node *next = cx_ll_malloc_node(list);
@@ -898,7 +898,7 @@
}
static void *cx_ll_at(
- struct cx_list_s const *list,
+ const struct cx_list_s *list,
size_t index
) {
cx_linked_list *ll = (cx_linked_list *) list;
@@ -908,7 +908,7 @@
static ssize_t cx_ll_find_remove(
struct cx_list_s *list,
- void const *elem,
+ const void *elem,
bool remove
) {
if (remove) {
@@ -950,8 +950,8 @@
}
static int cx_ll_compare(
- struct cx_list_s const *list,
- struct cx_list_s const *other
+ const struct cx_list_s *list,
+ const struct cx_list_s *other
) {
cx_linked_list *left = (cx_linked_list *) list;
cx_linked_list *right = (cx_linked_list *) other;
@@ -960,8 +960,8 @@
list->collection.cmpfunc);
}
-static bool cx_ll_iter_valid(void const *it) {
- struct cx_iterator_s const *iter = it;
+static bool cx_ll_iter_valid(const void *it) {
+ const struct cx_iterator_s *iter = it;
return iter->elem_handle != NULL;
}
@@ -1006,21 +1006,21 @@
}
}
-static void *cx_ll_iter_current(void const *it) {
- struct cx_iterator_s const *iter = it;
+static void *cx_ll_iter_current(const void *it) {
+ const struct cx_iterator_s *iter = it;
cx_linked_list_node *node = iter->elem_handle;
return node->payload;
}
static CxIterator cx_ll_iterator(
- struct cx_list_s const *list,
+ const struct cx_list_s *list,
size_t index,
bool backwards
) {
CxIterator iter;
iter.index = index;
iter.src_handle.c = list;
- iter.elem_handle = cx_ll_node_at((cx_linked_list const *) list, index);
+ iter.elem_handle = cx_ll_node_at((const cx_linked_list *) list, index);
iter.elem_size = list->collection.elem_size;
iter.elem_count = list->collection.size;
iter.base.valid = cx_ll_iter_valid;
@@ -1033,7 +1033,7 @@
static int cx_ll_insert_iter(
CxIterator *iter,
- void const *elem,
+ const void *elem,
int prepend
) {
struct cx_list_s *list = iter->src_handle.m;
@@ -1091,7 +1091,7 @@
};
CxList *cxLinkedListCreate(
- CxAllocator const *allocator,
+ const CxAllocator *allocator,
cx_compare_func comparator,
size_t elem_size
) {