diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/btree_test.c | 4 | ||||
| -rw-r--r-- | test/sorted_array_test.c | 2 | ||||
| -rw-r--r-- | test/tree_bench.c | 15 | ||||
| -rw-r--r-- | test/tree_test.c | 2 |
4 files changed, 15 insertions, 8 deletions
diff --git a/test/btree_test.c b/test/btree_test.c index 121d424..8257add 100644 --- a/test/btree_test.c +++ b/test/btree_test.c @@ -49,7 +49,7 @@ unique_rand(uint32_t i) } static int -int_cmp(const void* a, const void* b, void* user_data) +int_cmp(const void* a, const void* b, const void* user_data) { const uintptr_t ia = (uintptr_t)a; const uintptr_t ib = (uintptr_t)b; @@ -90,7 +90,7 @@ wildcard_cut(int test_num, size_t n_elems) /** Wildcard comparator where 0 matches anything >= wildcard_cut(n_elems). */ static int -wildcard_cmp(const void* a, const void* b, void* user_data) +wildcard_cmp(const void* a, const void* b, const void* user_data) { const TestContext* ctx = (TestContext*)user_data; const size_t n_elems = ctx->n_elems; diff --git a/test/sorted_array_test.c b/test/sorted_array_test.c index b235753..e7faa7a 100644 --- a/test/sorted_array_test.c +++ b/test/sorted_array_test.c @@ -32,7 +32,7 @@ unsigned seed = 1; static int -int_cmp(const void* a, const void* b, void* user_data) +int_cmp(const void* a, const void* b, const void* user_data) { const intptr_t ia = *(const intptr_t*)a; const intptr_t ib = *(const intptr_t*)b; diff --git a/test/tree_bench.c b/test/tree_bench.c index adb395f..58535e4 100644 --- a/test/tree_bench.c +++ b/test/tree_bench.c @@ -45,7 +45,7 @@ unique_rand(uint32_t i) } static int -int_cmp(const void* a, const void* b, void* user_data) +int_cmp(const void* a, const void* b, const void* user_data) { const intptr_t ia = (intptr_t)a; const intptr_t ib = (intptr_t)b; @@ -60,6 +60,12 @@ int_cmp(const void* a, const void* b, void* user_data) } static int +g_int_cmp(const void* a, const void* b, void* user_data) +{ + return int_cmp(a, b, user_data); +} + +static int test_fail(const char* fmt, ...) { va_list args; @@ -304,7 +310,7 @@ bench_glib(size_t n_elems, struct timespec insert_start = bench_start(); for (size_t i = 0; i < n_elems; ++i) { r = unique_rand(i); - GSequenceIter* iter = g_sequence_insert_sorted(t, (void*)r, int_cmp, NULL); + GSequenceIter* iter = g_sequence_insert_sorted(t, (void*)r, g_int_cmp, NULL); if (!iter || g_sequence_iter_is_end(iter)) { return test_fail("Failed to insert %zu\n", r); } @@ -315,7 +321,7 @@ bench_glib(size_t n_elems, struct timespec search_start = bench_start(); for (size_t i = 0; i < n_elems; ++i) { r = unique_rand(i); - GSequenceIter* iter = g_sequence_lookup(t, (void*)r, int_cmp, NULL); + GSequenceIter* iter = g_sequence_lookup(t, (void*)r, g_int_cmp, NULL); if (!iter || g_sequence_iter_is_end(iter)) { return test_fail("Failed to find %zu\n", r); } @@ -335,7 +341,8 @@ bench_glib(size_t n_elems, struct timespec del_start = bench_start(); for (size_t i = 0; i < n_elems; ++i) { r = unique_rand(i); - GSequenceIter* iter = g_sequence_lookup(t, (void*)r, int_cmp, NULL); + GSequenceIter* iter = + g_sequence_lookup(t, (void*)r, g_int_cmp, NULL); if (!iter || g_sequence_iter_is_end(iter)) { return test_fail("Failed to remove %zu\n", r); } diff --git a/test/tree_test.c b/test/tree_test.c index b806acd..ac85ea4 100644 --- a/test/tree_test.c +++ b/test/tree_test.c @@ -31,7 +31,7 @@ unsigned seed = 1; static int -int_cmp(const void* a, const void* b, void* user_data) +int_cmp(const void* a, const void* b, const void* user_data) { const intptr_t ia = (intptr_t)a; const intptr_t ib = (intptr_t)b; |