From 1fa53c5bf8d0717f784c79abaa5111f88ab00221 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Wed, 15 Sep 2021 17:04:21 +0200 Subject: Squashed 'dependencies/uthash/' changes from 8e67ced..bf15263 bf15263 Fix a "bug" in the example where option 3 interfered with option 1's counter. b6e24ef Use `malloc(sizeof *s)` in example code. a109c6b Stop using `gets` in example.c. c85c9e1 fix: fix utstack example's compiling error 86e6776 Replace *.github.com urls with *.github.io (#227) e493aa9 Bump version to 2.3.0. ae2ac52 Fix README.md to display the *actual* TravisCI status. 134e241 Silence -Wswitch-default warnings, and add it to the TravisCI config. 62fefa6 Fix some typos in userguide.txt, and re-remove spaces in macro definitions. 37d2021 tests: add whitespaces to example code 524ca1a doc: add whitespaces to documentation 0f6c619 Fix a typo in the documentation for HASH_COUNT. NFC. 388134a Rename uthash_memcmp to HASH_KEYCMP, step 3. 053bed1 Eliminate HASH_FCN; change the handling of HASH_FUNCTION to match HASH_KEYCMP. f0e1bd9 Refactor test93.c to avoid scan-build warnings. 45af88c Remove two dead writes in tests, to silence scan-build warnings. 66e2668 Bump version to 2.2.0. 973bd67 uthash.h: Swap multiplicands to put the widest ones first. 15ad042 Always include , unless HASH_NO_STDINT is defined by the user. 6b4768b Rename uthash_memcmp to HASH_KEYCMP, step 2. e64c7f0 Update tests/README to describe the most recently added tests. NFC. c62796c HASH_CLEAR after some tests, to eliminate "memory leak" warnings. 7f0aadb Support spaces in $exe path 0831d9a uthash.h: fix compiler warning -Wcast-qual ba2fbfd utarray.h: preserve constness in utarray_str_cpy git-subtree-dir: dependencies/uthash git-subtree-split: bf15263081be6229be31addd48566df93921cb46 --- tests/test6.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'tests/test6.c') diff --git a/tests/test6.c b/tests/test6.c index 55ce36bfb..919afa8e1 100644 --- a/tests/test6.c +++ b/tests/test6.c @@ -7,15 +7,16 @@ /* Set up macros for alternative malloc/free functions */ #undef uthash_malloc #undef uthash_free -#undef uthash_memcmp #undef uthash_strlen #undef uthash_bzero #define uthash_malloc(sz) alt_malloc(sz) #define uthash_free(ptr,sz) alt_free(ptr,sz) -#define uthash_memcmp(a,b,n) alt_memcmp(a,b,n) #define uthash_strlen(s) ..fail_to_compile.. #define uthash_bzero(a,n) alt_bzero(a,n) +#undef HASH_KEYCMP +#define HASH_KEYCMP(a,b,n) alt_keycmp(a,b,n) + typedef struct example_user_t { int id; int cookie; @@ -41,10 +42,10 @@ static void alt_free(void *ptr, size_t sz) free(ptr); } -static int alt_memcmp_count = 0; -static int alt_memcmp(const void *a, const void *b, size_t n) +static int alt_keycmp_count = 0; +static int alt_keycmp(const void *a, const void *b, size_t n) { - ++alt_memcmp_count; + ++alt_keycmp_count; return memcmp(a,b,n); } @@ -115,7 +116,7 @@ int main() #else assert(alt_bzero_count == 2); #endif - assert(alt_memcmp_count == 10); + assert(alt_keycmp_count == 10); assert(alt_malloc_balance == 0); return 0; } -- cgit v1.2.3