From 25b81425ef6e9604135c06516e86b17ca7d5f3f1 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Sun, 1 Jul 2012 19:29:33 +0200 Subject: [PATCH] misc: change hashtable compare function to return bool It really doesn't make sense to expect an integer here as memcmp() and friends use an integer, too, but in reversed logic. So use bool to avoid confusion. Signed-off-by: David Herrmann --- src/static_misc.c | 2 +- src/static_misc.h | 4 ++-- src/unicode.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/static_misc.c b/src/static_misc.c index 3a3c4ba..6801ba6 100644 --- a/src/static_misc.c +++ b/src/static_misc.c @@ -300,7 +300,7 @@ unsigned int kmscon_direct_hash(const void *data) return (unsigned int)(unsigned long)data; } -int kmscon_direct_equal(const void *data1, const void *data2) +bool kmscon_direct_equal(const void *data1, const void *data2) { return data1 == data2; } diff --git a/src/static_misc.h b/src/static_misc.h index 04fee4d..c824cba 100644 --- a/src/static_misc.h +++ b/src/static_misc.h @@ -76,11 +76,11 @@ void kmscon_hook_call(struct kmscon_hook *hook, void *parent, void *arg); struct kmscon_hashtable; typedef unsigned int (*kmscon_hash_cb) (const void *data); -typedef int (*kmscon_equal_cb) (const void *data1, const void *data2); +typedef bool (*kmscon_equal_cb) (const void *data1, const void *data2); typedef void (*kmscon_free_cb) (void *data); unsigned int kmscon_direct_hash(const void *data); -int kmscon_direct_equal(const void *data1, const void *data2); +bool kmscon_direct_equal(const void *data1, const void *data2); int kmscon_hashtable_new(struct kmscon_hashtable **out, kmscon_hash_cb hash_cb, diff --git a/src/unicode.c b/src/unicode.c index 462abad..1af6592 100644 --- a/src/unicode.c +++ b/src/unicode.c @@ -105,7 +105,7 @@ static guint hash_ucs4(gconstpointer key) return val; } -static gboolean cmp_ucs4(gconstpointer a, gconstpointer b) +static bool cmp_ucs4(gconstpointer a, gconstpointer b) { size_t i; const uint32_t *v1, *v2;