diff -r 0ac4aa1737fd -r 6e0c3a8a914a src/list.c --- a/src/list.c Fri Oct 17 15:04:56 2025 +0200 +++ b/src/list.c Fri Oct 17 16:53:24 2025 +0200 @@ -115,7 +115,7 @@ const void *elem, int prepend ) { - struct cx_list_s *list = iter->src_handle.m; + struct cx_list_s *list = iter->src_handle; return list->climpl->insert_iter(iter, &elem, prepend); } @@ -246,7 +246,7 @@ cx_attr_unused bool backwards ) { CxIterator iter = {0}; - iter.src_handle.c = list; + iter.src_handle = (void*) list; iter.index = index; iter.base.valid = cx_emptyl_iter_valid; return iter; @@ -650,13 +650,13 @@ } int cxListInsertAfter(CxIterator *iter, const void *elem) { - CxList* list = (CxList*)iter->src_handle.m; + CxList* list = (CxList*)iter->src_handle; list->collection.sorted = false; return list->cl->insert_iter(iter, elem, 0); } int cxListInsertBefore(CxIterator *iter, const void *elem) { - CxList* list = (CxList*)iter->src_handle.m; + CxList* list = (CxList*)iter->src_handle; list->collection.sorted = false; return list->cl->insert_iter(iter, elem, 1); } @@ -735,40 +735,16 @@ return list->cl->iterator(list, index, true); } -CxIterator cxListMutIteratorAt(CxList *list, size_t index) { - if (list == NULL) list = cxEmptyList; - CxIterator it = list->cl->iterator(list, index, false); - it.base.mutating = true; - return it; -} - -CxIterator cxListMutBackwardsIteratorAt(CxList *list, size_t index) { - if (list == NULL) list = cxEmptyList; - CxIterator it = list->cl->iterator(list, index, true); - it.base.mutating = true; - return it; -} - CxIterator cxListIterator(const CxList *list) { if (list == NULL) list = cxEmptyList; return list->cl->iterator(list, 0, false); } -CxIterator cxListMutIterator(CxList *list) { - if (list == NULL) list = cxEmptyList; - return cxListMutIteratorAt(list, 0); -} - CxIterator cxListBackwardsIterator(const CxList *list) { if (list == NULL) list = cxEmptyList; return list->cl->iterator(list, list->collection.size - 1, true); } -CxIterator cxListMutBackwardsIterator(CxList *list) { - if (list == NULL) list = cxEmptyList; - return cxListMutBackwardsIteratorAt(list, list->collection.size - 1); -} - size_t cxListFind(const CxList *list, const void *elem) { return list->cl->find_remove((CxList*)list, elem, false); }