From f928e67b46bca4922532d909bddd116f3d991179 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 14 Nov 2018 01:21:25 +0100 Subject: Make comparator functions take const user data --- test/tree_bench.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'test/tree_bench.c') 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; @@ -59,6 +59,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, ...) { @@ -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); } -- cgit v1.2.1