From 2ff624eae24742faf17889f858dbdaa6d4a064ea Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 20 Oct 2022 21:34:22 -0400 Subject: Split up common header --- src/btree.c | 52 ++++++++++++++++++++++++++-------------------------- src/errno_status.c | 2 +- src/errno_status.h | 2 +- src/ring.c | 2 +- src/sem.c | 2 +- src/status.c | 2 +- src/thread.c | 2 +- src/tree.c | 7 ++++--- 8 files changed, 36 insertions(+), 35 deletions(-) (limited to 'src') diff --git a/src/btree.c b/src/btree.c index 0725612..30a1538 100644 --- a/src/btree.c +++ b/src/btree.c @@ -25,11 +25,11 @@ typedef uint16_t ZixShort; #define ZIX_BTREE_INODE_VALS (ZIX_BTREE_LEAF_VALS / 2U) struct ZixBTreeImpl { - ZixAllocator* allocator; - ZixBTreeNode* root; - ZixComparator cmp; - const void* cmp_data; - size_t size; + ZixAllocator* allocator; + ZixBTreeNode* root; + ZixCompareFunc cmp; + const void* cmp_data; + size_t size; }; struct ZixBTreeNodeImpl { @@ -88,9 +88,9 @@ zix_btree_child(const ZixBTreeNode* const node, const unsigned i) } ZixBTree* -zix_btree_new(ZixAllocator* const allocator, - const ZixComparator cmp, - const void* const cmp_data) +zix_btree_new(ZixAllocator* const allocator, + const ZixCompareFunc cmp, + const void* const cmp_data) { #if !((defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || \ (defined(__cplusplus) && __cplusplus >= 201103L)) @@ -263,11 +263,11 @@ zix_btree_split_child(ZixAllocator* const allocator, #ifdef ZIX_BTREE_SORTED_CHECK /// Check that `n` is sorted with respect to search key `e` static bool -zix_btree_node_is_sorted_with_respect_to(const ZixComparator compare, - const void* const compare_user_data, - void* const* const values, - const unsigned n_values, - const void* const key) +zix_btree_node_is_sorted_with_respect_to(const ZixCompareFunc compare, + const void* const compare_user_data, + void* const* const values, + const unsigned n_values, + const void* const key) { if (n_values <= 1U) { return true; @@ -288,12 +288,12 @@ zix_btree_node_is_sorted_with_respect_to(const ZixComparator compare, #endif static unsigned -zix_btree_find_value(const ZixComparator compare, - const void* const compare_user_data, - void* const* const values, - const unsigned n_values, - const void* const key, - bool* const equal) +zix_btree_find_value(const ZixCompareFunc compare, + const void* const compare_user_data, + void* const* const values, + const unsigned n_values, + const void* const key, + bool* const equal) { unsigned first = 0U; unsigned count = n_values; @@ -323,12 +323,12 @@ zix_btree_find_value(const ZixComparator compare, } static unsigned -zix_btree_find_pattern(const ZixComparator compare_key, - const void* const compare_key_user_data, - void* const* const values, - const unsigned n_values, - const void* const key, - bool* const equal) +zix_btree_find_pattern(const ZixCompareFunc compare_key, + const void* const compare_key_user_data, + void* const* const values, + const unsigned n_values, + const void* const key, + bool* const equal) { #ifdef ZIX_BTREE_SORTED_CHECK assert(zix_btree_node_is_sorted_with_respect_to( @@ -854,7 +854,7 @@ zix_btree_find(const ZixBTree* const t, ZixStatus zix_btree_lower_bound(const ZixBTree* const t, - const ZixComparator compare_key, + const ZixCompareFunc compare_key, const void* const compare_key_user_data, const void* const key, ZixBTreeIter* const ti) diff --git a/src/errno_status.c b/src/errno_status.c index 1830234..142d456 100644 --- a/src/errno_status.c +++ b/src/errno_status.c @@ -3,7 +3,7 @@ #include "errno_status.h" -#include "zix/common.h" +#include "zix/status.h" #include #include diff --git a/src/errno_status.h b/src/errno_status.h index da26b66..2f81e4e 100644 --- a/src/errno_status.h +++ b/src/errno_status.h @@ -5,7 +5,7 @@ #define ZIX_ERRNO_STATUS_H #include "zix/attributes.h" -#include "zix/common.h" +#include "zix/status.h" /// Return an errno value converted to a status code ZIX_CONST_FUNC diff --git a/src/ring.c b/src/ring.c index 287639b..23199a0 100644 --- a/src/ring.c +++ b/src/ring.c @@ -7,7 +7,7 @@ #include "zix_config.h" #include "zix/allocator.h" -#include "zix/common.h" +#include "zix/status.h" #if USE_MLOCK # include diff --git a/src/sem.c b/src/sem.c index 8593908..4b87297 100644 --- a/src/sem.c +++ b/src/sem.c @@ -6,7 +6,7 @@ #include "errno_status.h" #include "zix_config.h" -#include "zix/common.h" +#include "zix/status.h" #ifdef __APPLE__ # include diff --git a/src/status.c b/src/status.c index 9cdab32..4b06b97 100644 --- a/src/status.c +++ b/src/status.c @@ -1,7 +1,7 @@ // Copyright 2014-2020 David Robillard // SPDX-License-Identifier: ISC -#include "zix/common.h" +#include "zix/status.h" const char* zix_strerror(const ZixStatus status) diff --git a/src/thread.c b/src/thread.c index c13f2ab..9b8af20 100644 --- a/src/thread.c +++ b/src/thread.c @@ -5,7 +5,7 @@ #include "errno_status.h" -#include "zix/common.h" +#include "zix/status.h" #ifdef _WIN32 # include diff --git a/src/tree.c b/src/tree.c index 2c66dfc..a362ea8 100644 --- a/src/tree.c +++ b/src/tree.c @@ -3,7 +3,8 @@ #include "zix/tree.h" -#include "zix/common.h" +#include "zix/function_types.h" +#include "zix/status.h" #include @@ -14,7 +15,7 @@ struct ZixTreeImpl { ZixTreeNode* root; ZixDestroyFunc destroy; const void* destroy_user_data; - ZixComparator cmp; + ZixCompareFunc cmp; void* cmp_data; size_t size; bool allow_duplicates; @@ -52,7 +53,7 @@ zix_tree_noop_destroy(void* const ptr, const void* const user_data) ZixTree* zix_tree_new(ZixAllocator* const allocator, bool allow_duplicates, - ZixComparator cmp, + ZixCompareFunc cmp, void* cmp_data, ZixDestroyFunc destroy, const void* destroy_user_data) -- cgit v1.2.1