ucx: comparison src/cx/array

-:8b0f162ac88e
+:36c0fb2b60b2
 #ifndef UCX_ARRAY_LIST_H
 #define UCX_ARRAY_LIST_H
 #include "list.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
 /**
 * The maximum item size in an array list that fits into
 * a stack buffer when swapped.
 */
 CX_EXPORT extern const unsigned cx_array_swap_sbo_size;
 * @param elem_size size of one element
 * @param capacity the initial maximum number of elements
 * @retval zero allocation was successful
 * @retval non-zero allocation failed
 */
-cx_attr_nonnull
+CX_EXTERN CX_NONNULL
-CX_EXPORT int cx_array_init_(const CxAllocator *allocator, CxArray *array, size_t elem_size, size_t capacity);
+int cx_array_init_(const CxAllocator *allocator, CxArray *array, size_t elem_size, size_t capacity);
 /**
 * Initializes an array by allocating memory.
 *
 * The size is set to zero.
 * @param array a pointer to the array structure
 * @param data the fixed size array
 * @param capacity the capacity of the fixed size array
 * @param size the number of initialized elements in the fixed size array
 */
-cx_attr_nonnull
+CX_EXTERN CX_NONNULL
-CX_EXPORT void cx_array_init_fixed_(CxArray *array, const void *data, size_t capacity, size_t size);
+void cx_array_init_fixed_(CxArray *array, const void *data, size_t capacity, size_t size);
 /**
 * Initializes an array with fixed size memory.
 *
 * This is useful, for example, when you want to work with memory on the stack
 * @param elem_size the size of one element
 * @param capacity the new capacity
 * @retval zero allocation was successful
 * @retval non-zero allocation failed
 */
-cx_attr_nonnull
+CX_EXTERN CX_NONNULL
-CX_EXPORT int cx_array_reserve_(const CxAllocator *allocator, CxArray *array, size_t elem_size, size_t capacity);
+int cx_array_reserve_(const CxAllocator *allocator, CxArray *array, size_t elem_size, size_t capacity);
 /**
 * Changes the capacity of an array.
 *
 * If required, the size is reduced to fit into the new capacity.
 * @param elem_size the size of one element
 * @param capacity the new capacity
 * @retval zero allocation was successful
 * @retval non-zero allocation failed
 */
-cx_attr_nonnull
+CX_EXTERN CX_NONNULL
-CX_EXPORT int cx_array_copy_to_new_(const CxAllocator *allocator, CxArray *array, size_t elem_size, size_t capacity);
+int cx_array_copy_to_new_(const CxAllocator *allocator, CxArray *array, size_t elem_size, size_t capacity);
 /**
 * Copies the array to a new memory region.
 *
 * This is useful when you have initialized the array with a fixed size memory
 * @param other a pointer to an array of data that shall be inserted
 * @param n the number of elements that shall be inserted
 * @retval zero success
 * @retval non-zero a re-allocation was necessary but failed
 */
-cx_attr_nonnull_arg(1, 2)
+CX_EXTERN CX_NONNULL_ARG(1, 2)
-CX_EXPORT int cx_array_insert_(const CxAllocator *allocator, CxArray *array,
+int cx_array_insert_(const CxAllocator *allocator, CxArray *array,
 size_t elem_size, size_t index, const void *other, size_t n);
 /**
 * Appends an element to an array.
 *
 * @param cmp_func the compare function
 * @param allow_duplicates @c false if duplicates shall be skipped during insertion
 * @retval zero success
 * @retval non-zero a re-allocation was necessary but failed
 */
-cx_attr_nonnull
+CX_EXTERN CX_NONNULL
-CX_EXPORT int cx_array_insert_sorted_(const CxAllocator *allocator, CxArray *array,
+int cx_array_insert_sorted_(const CxAllocator *allocator, CxArray *array,
 size_t elem_size, const void *sorted_data, size_t n,
 cx_compare_func cmp_func, bool allow_duplicates);
 /**
 * Inserts an element into a sorted array.
 * @param context additional context for the compare function
 * @param allow_duplicates @c false if duplicates shall be skipped during insertion
 * @retval zero success
 * @retval non-zero a re-allocation was necessary but failed
 */
-cx_attr_nonnull_arg(1, 2, 4, 6)
+CX_EXTERN CX_NONNULL_ARG(1, 2, 4, 6)
-CX_EXPORT int cx_array_insert_sorted_c_(const CxAllocator *allocator, CxArray *array,
+int cx_array_insert_sorted_c_(const CxAllocator *allocator, CxArray *array,
 size_t elem_size, const void *sorted_data, size_t n,
 cx_compare_func2 cmp_func, void *context, bool allow_duplicates);
 /**
 * Inserts an element into a sorted array.
 * @param nmemb the number of elements in the array
 * @param size the size of one element
 * @param fn the compare function
 * @param context the context for the compare function
 */
-CX_EXPORT void cx_array_qsort_c(void *array, size_t nmemb, size_t size,
+CX_EXTERN CX_NONNULL
+void cx_array_qsort_c(void *array, size_t nmemb, size_t size,
 cx_compare_func2 fn, void *context);
 /**
 * Sorts an array.
 *
 *
 * @param array a pointer to the array structure
 * @param elem_size the size of one element
 * @param fn the compare function
 */
-CX_EXPORT void cx_array_sort_(CxArray *array, size_t elem_size,
+CX_EXTERN CX_NONNULL
+void cx_array_sort_(CxArray *array, size_t elem_size,
 cx_compare_func fn);
 /**
 * Sorts an array.
 *
 * @param array a pointer to the array structure
 * @param elem_size the size of one element
 * @param fn the compare function
 * @param context the context for the compare function
 */
-CX_EXPORT void cx_array_sort_c_(CxArray *array, size_t elem_size,
+CX_EXTERN CX_NONNULL
+void cx_array_sort_c_(CxArray *array, size_t elem_size,
 cx_compare_func2 fn, void *context);
 /**
 * Sorts an array.
 *
 *
 * @param array a pointer to the array structure
 * @param elem_size the size of one element
 * @return an iterator over the elements
 */
-cx_attr_nodiscard cx_attr_nonnull
+CX_EXTERN CX_NODISCARD CX_NONNULL
-CX_EXPORT CxIterator cx_array_iterator_(CxArray *array, size_t elem_size);
+CxIterator cx_array_iterator_(CxArray *array, size_t elem_size);
 /**
 * Creates an iterator over the elements of an array.
 *
 * The iterator will yield pointers to the elements.
 * Internal function - do not use.
 *
 * @param array the name of the array
 * @return an iterator over the elements
 */
-cx_attr_nodiscard cx_attr_nonnull
+CX_EXTERN CX_NODISCARD CX_NONNULL
-CX_EXPORT CxIterator cx_array_iterator_ptr_(CxArray *array);
+CxIterator cx_array_iterator_ptr_(CxArray *array);
 /**
 * Creates an iterator over the elements of an array containing pointers.
 *
 * The iterator will yield the elements themselves, which are supposed to
 * @param elem_size the size of one element
 * @param index the index of the first element to remove
 * @param n the number of elements to remove
 * @param fast indicates whether tail elements should be copied into the gap
 */
-cx_attr_nonnull
+CX_EXTERN CX_NONNULL
-CX_EXPORT void cx_array_remove_(CxArray *array, size_t elem_size, size_t index, size_t n, bool fast);
+void cx_array_remove_(CxArray *array, size_t elem_size, size_t index, size_t n, bool fast);
 /**
 * Removes one element from the array.
 *
 * Tail elements are all moved by one. If you don't need a stable order
 * Internal function - do not use.
 *
 * @param allocator (@c CxAllocator*) the allocator which was used to allocate the array
 * @param array a pointer to the array structure
 */
-cx_attr_nonnull
+CX_EXTERN CX_NONNULL
-CX_EXPORT void cx_array_free_(const CxAllocator *allocator, CxArray *array);
+void cx_array_free_(const CxAllocator *allocator, CxArray *array);
 /**
 * Deallocates an array.
 *
 * The structure is reset to zero and can be re-initialized with
 * @param cmp_func the compare function
 * @return the index of the largest lower bound, or @p size
 * @see cx_array_binary_search_sup()
 * @see cx_array_binary_search()
 */
-cx_attr_nonnull
+CX_EXTERN CX_NONNULL
-CX_EXPORT size_t cx_array_binary_search_inf(const void *arr, size_t size,
+size_t cx_array_binary_search_inf(const void *arr, size_t size,
 size_t elem_size, const void *elem, cx_compare_func cmp_func);
 /**
 * Searches an item in a sorted array.
 *
 * @return the index of the element in the array, or @p size if the element
 * cannot be found
 * @see cx_array_binary_search_inf()
 * @see cx_array_binary_search_sup()
 */
-cx_attr_nonnull
+CX_EXTERN CX_NONNULL
-CX_EXPORT size_t cx_array_binary_search(const void *arr, size_t size,
+size_t cx_array_binary_search(const void *arr, size_t size,
 size_t elem_size, const void *elem, cx_compare_func cmp_func);
 /**
 * Searches the smallest upper bound in a sorted array.
 *
 * @param cmp_func the compare function
 * @return the index of the smallest upper bound, or @p size
 * @see cx_array_binary_search_inf()
 * @see cx_array_binary_search()
 */
-cx_attr_nonnull
+CX_EXTERN CX_NONNULL
-CX_EXPORT size_t cx_array_binary_search_sup(const void *arr, size_t size,
+size_t cx_array_binary_search_sup(const void *arr, size_t size,
 size_t elem_size, const void *elem, cx_compare_func cmp_func);
 /**
 * Searches the largest lower bound in a sorted array.
 * @param context the context for the compare function
 * @return the index of the largest lower bound, or @p size
 * @see cx_array_binary_search_sup()
 * @see cx_array_binary_search()
 */
-cx_attr_nonnull
+CX_EXTERN CX_NONNULL
-CX_EXPORT size_t cx_array_binary_search_inf_c(const void *arr, size_t size,
+size_t cx_array_binary_search_inf_c(const void *arr, size_t size,
 size_t elem_size, const void *elem, cx_compare_func2 cmp_func, void *context);
 /**
 * Searches an item in a sorted array.
 *
 * @return the index of the element in the array, or @p size if the element
 * cannot be found
 * @see cx_array_binary_search_inf()
 * @see cx_array_binary_search_sup()
 */
-cx_attr_nonnull
+CX_EXTERN CX_NONNULL
-CX_EXPORT size_t cx_array_binary_search_c(const void *arr, size_t size,
+size_t cx_array_binary_search_c(const void *arr, size_t size,
 size_t elem_size, const void *elem, cx_compare_func2 cmp_func, void *context);
 /**
 * Searches the smallest upper bound in a sorted array.
 *
 * @param context the context for the compare function
 * @return the index of the smallest upper bound, or @p size
 * @see cx_array_binary_search_inf()
 * @see cx_array_binary_search()
 */
-cx_attr_nonnull
+CX_EXTERN CX_NONNULL
-CX_EXPORT size_t cx_array_binary_search_sup_c(const void *arr, size_t size,
+size_t cx_array_binary_search_sup_c(const void *arr, size_t size,
 size_t elem_size, const void *elem, cx_compare_func2 cmp_func, void *context);
 /**
 * Swaps two array elements.
 *
 * @param arr the array
 * @param elem_size the element size
 * @param idx1 index of the first element
 * @param idx2 index of the second element
 */
-cx_attr_nonnull
+CX_EXTERN CX_NONNULL
-CX_EXPORT void cx_array_swap(void *arr, size_t elem_size, size_t idx1, size_t idx2);
+void cx_array_swap(void *arr, size_t elem_size, size_t idx1, size_t idx2);
 /**
 * Allocates an array list for storing elements with @p elem_size bytes each.
 *
 * If @p elem_size is #CX_STORE_POINTERS, the created list stores pointers instead of
 * (if @c NULL, the cxDefaultAllocator will be used)
 * @param elem_size the size of each element in bytes
 * @param initial_capacity the initial number of elements the array can store
 * @return the created list
 */
-cx_attr_nodiscard
+CX_EXTERN CX_NODISCARD CX_MALLOC CX_DEALLOC(cxListFree, 1)
-cx_attr_malloc
+CxList *cxArrayListCreate(const CxAllocator *allocator,
-cx_attr_dealloc(cxListFree, 1)
-CX_EXPORT CxList *cxArrayListCreate(const CxAllocator *allocator,
 size_t elem_size, size_t initial_capacity);
-#ifdef __cplusplus
-} // extern "C"
-#endif
 #endif // UCX_ARRAY_LIST_H

comparison: src/cx/array_list.h

src/cx/array_list.h

Mercurial > hg > ucx / file comparison

comparison: src/cx/array_list.h

src/cx/array_list.h