diff -r f549fd9fbd8f -r 54565fd74e74 src/cx/list.h --- a/src/cx/list.h Wed Sep 18 00:02:18 2024 +0200 +++ b/src/cx/list.h Sat Sep 28 15:47:28 2024 +0200 @@ -56,11 +56,11 @@ /** * The list class definition. */ - cx_list_class const *cl; + const cx_list_class *cl; /** * The actual implementation in case the list class is delegating. */ - cx_list_class const *climpl; + const cx_list_class *climpl; }; /** @@ -82,7 +82,7 @@ int (*insert_element)( struct cx_list_s *list, size_t index, - void const *data + const void *data ); /** @@ -93,7 +93,7 @@ size_t (*insert_array)( struct cx_list_s *list, size_t index, - void const *data, + const void *data, size_t n ); @@ -104,7 +104,7 @@ */ size_t (*insert_sorted)( struct cx_list_s *list, - void const *sorted_data, + const void *sorted_data, size_t n ); @@ -113,7 +113,7 @@ */ int (*insert_iter)( struct cx_iterator_s *iter, - void const *elem, + const void *elem, int prepend ); @@ -144,7 +144,7 @@ * Member function for element lookup. */ void *(*at)( - struct cx_list_s const *list, + const struct cx_list_s *list, size_t index ); @@ -153,7 +153,7 @@ */ ssize_t (*find_remove)( struct cx_list_s *list, - void const *elem, + const void *elem, bool remove ); @@ -169,8 +169,8 @@ * If set to \c NULL, comparison won't be optimized. */ int (*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 ); /** @@ -182,7 +182,7 @@ * Member function for returning an iterator pointing to the specified index. */ struct cx_iterator_s (*iterator)( - struct cx_list_s const *list, + const struct cx_list_s *list, size_t index, bool backward ); @@ -206,7 +206,7 @@ size_t cx_list_default_insert_array( struct cx_list_s *list, size_t index, - void const *data, + const void *data, size_t n ); @@ -229,7 +229,7 @@ __attribute__((__nonnull__)) size_t cx_list_default_insert_sorted( struct cx_list_s *list, - void const *sorted_data, + const void *sorted_data, size_t n ); @@ -302,7 +302,7 @@ * @see cxListStorePointers() */ __attribute__((__nonnull__)) -static inline bool cxListIsStoringPointers(CxList const *list) { +static inline bool cxListIsStoringPointers(const CxList *list) { return list->collection.store_pointer; } @@ -313,7 +313,7 @@ * @return the number of currently stored elements */ __attribute__((__nonnull__)) -static inline size_t cxListSize(CxList const *list) { +static inline size_t cxListSize(const CxList *list) { return list->collection.size; } @@ -328,7 +328,7 @@ __attribute__((__nonnull__)) static inline int cxListAdd( CxList *list, - void const *elem + const void *elem ) { return list->cl->insert_element(list, list->collection.size, elem); } @@ -352,7 +352,7 @@ __attribute__((__nonnull__)) static inline size_t cxListAddArray( CxList *list, - void const *array, + const void *array, size_t n ) { return list->cl->insert_array(list, list->collection.size, array, n); @@ -375,7 +375,7 @@ static inline int cxListInsert( CxList *list, size_t index, - void const *elem + const void *elem ) { return list->cl->insert_element(list, index, elem); } @@ -390,9 +390,9 @@ __attribute__((__nonnull__)) static inline int cxListInsertSorted( CxList *list, - void const *elem + const void *elem ) { - void const *data = list->collection.store_pointer ? &elem : elem; + const void *data = list->collection.store_pointer ? &elem : elem; return list->cl->insert_sorted(list, data, 1) == 0; } @@ -419,7 +419,7 @@ static inline size_t cxListInsertArray( CxList *list, size_t index, - void const *array, + const void *array, size_t n ) { return list->cl->insert_array(list, index, array, n); @@ -445,7 +445,7 @@ __attribute__((__nonnull__)) static inline size_t cxListInsertSortedArray( CxList *list, - void const *array, + const void *array, size_t n ) { return list->cl->insert_sorted(list, array, n); @@ -469,7 +469,7 @@ __attribute__((__nonnull__)) static inline int cxListInsertAfter( CxIterator *iter, - void const *elem + const void *elem ) { return ((struct cx_list_s *) iter->src_handle.m)->cl->insert_iter(iter, elem, 0); } @@ -492,7 +492,7 @@ __attribute__((__nonnull__)) static inline int cxListInsertBefore( CxIterator *iter, - void const *elem + const void *elem ) { return ((struct cx_list_s *) iter->src_handle.m)->cl->insert_iter(iter, elem, 1); } @@ -576,7 +576,7 @@ */ __attribute__((__nonnull__, __warn_unused_result__)) static inline CxIterator cxListIteratorAt( - CxList const *list, + const CxList *list, size_t index ) { return list->cl->iterator(list, index, false); @@ -595,7 +595,7 @@ */ __attribute__((__nonnull__, __warn_unused_result__)) static inline CxIterator cxListBackwardsIteratorAt( - CxList const *list, + const CxList *list, size_t index ) { return list->cl->iterator(list, index, true); @@ -647,7 +647,7 @@ * @return a new iterator */ __attribute__((__nonnull__, __warn_unused_result__)) -static inline CxIterator cxListIterator(CxList const *list) { +static inline CxIterator cxListIterator(const CxList *list) { return list->cl->iterator(list, 0, false); } @@ -678,7 +678,7 @@ * @return a new iterator */ __attribute__((__nonnull__, __warn_unused_result__)) -static inline CxIterator cxListBackwardsIterator(CxList const *list) { +static inline CxIterator cxListBackwardsIterator(const CxList *list) { return list->cl->iterator(list, list->collection.size - 1, true); } @@ -709,8 +709,8 @@ */ __attribute__((__nonnull__)) static inline ssize_t cxListFind( - CxList const *list, - void const *elem + const CxList *list, + const void *elem ) { return list->cl->find_remove((CxList*)list, elem, false); } @@ -728,7 +728,7 @@ __attribute__((__nonnull__)) static inline ssize_t cxListFindRemove( CxList *list, - void const *elem + const void *elem ) { return list->cl->find_remove(list, elem, true); } @@ -768,8 +768,8 @@ */ __attribute__((__nonnull__)) int cxListCompare( - CxList const *list, - CxList const *other + const CxList *list, + const CxList *other ); /**