diff -r fe0d69d72bcd -r 35bcb3216c0d src/linked_list.c --- a/src/linked_list.c Thu May 23 20:29:28 2024 +0200 +++ b/src/linked_list.c Thu May 23 20:31:37 2024 +0200 @@ -518,14 +518,14 @@ // create the new new_node cx_linked_list_node *new_node = cxMalloc(list->base.allocator, - sizeof(cx_linked_list_node) + list->base.item_size); + sizeof(cx_linked_list_node) + list->base.elem_size); // sortir if failed if (new_node == NULL) return 1; // initialize new new_node new_node->prev = new_node->next = NULL; - memcpy(new_node->payload, elem, list->base.item_size); + memcpy(new_node->payload, elem, list->base.elem_size); // insert cx_linked_list *ll = (cx_linked_list *) list; @@ -566,7 +566,7 @@ // we can add the remaining nodes and immedately advance to the inserted node char const *source = array; for (size_t i = 1; i < n; i++) { - source += list->base.item_size; + source += list->base.elem_size; if (0 != cx_ll_insert_at(list, node, source)) { return i; } @@ -707,7 +707,7 @@ } } - if (list->base.item_size > CX_LINKED_LIST_SWAP_SBO_SIZE) { + if (list->base.elem_size > CX_LINKED_LIST_SWAP_SBO_SIZE) { cx_linked_list_node *prev = nleft->prev; cx_linked_list_node *next = nright->next; cx_linked_list_node *midstart = nleft->next; @@ -739,9 +739,9 @@ } else { // swap payloads to avoid relinking char buf[CX_LINKED_LIST_SWAP_SBO_SIZE]; - memcpy(buf, nleft->payload, list->base.item_size); - memcpy(nleft->payload, nright->payload, list->base.item_size); - memcpy(nright->payload, buf, list->base.item_size); + memcpy(buf, nleft->payload, list->base.elem_size); + memcpy(nleft->payload, nright->payload, list->base.elem_size); + memcpy(nright->payload, buf, list->base.elem_size); } return 0; @@ -871,7 +871,7 @@ iter.index = index; iter.src_handle.c = list; iter.elem_handle = cx_ll_node_at((cx_linked_list const *) list, index); - iter.elem_size = list->base.item_size; + iter.elem_size = list->base.elem_size; iter.elem_count = list->base.size; iter.base.valid = cx_ll_iter_valid; iter.base.current = cx_ll_iter_current; @@ -934,7 +934,7 @@ CxList *cxLinkedListCreate( CxAllocator const *allocator, cx_compare_func comparator, - size_t item_size + size_t elem_size ) { if (allocator == NULL) { allocator = cxDefaultAllocator; @@ -946,8 +946,8 @@ list->base.cl = &cx_linked_list_class; list->base.base.allocator = allocator; - if (item_size > 0) { - list->base.base.item_size = item_size; + if (elem_size > 0) { + list->base.base.elem_size = elem_size; list->base.base.cmpfunc = comparator; } else { list->base.base.cmpfunc = comparator == NULL ? cx_cmp_ptr : comparator;