From 435671e947bc8141d1615581bd17b18a9bcfba55 Mon Sep 17 00:00:00 2001
From: Bruce Cowan <bruce.cowan@strath.ac.uk>
Date: Tue, 24 Dec 2019 13:04:50 +0000
Subject: [PATCH] Make function pointer typedefs more generic
---
lib/types/hashtable.c | 10 +++++-----
lib/types/hashtable.h | 2 +-
lib/types/types.h | 12 ++++++------
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/lib/types/hashtable.c b/lib/types/hashtable.c
index 419e8be..7cbe6a7 100644
--- a/lib/types/hashtable.c
+++ b/lib/types/hashtable.c
@@ -18,7 +18,7 @@ struct _HashTable
SList **array;
HashFunc hash_func;
- HashEqualFunc equal_func;
+ EqualFunc equal_func;
FreeFunc free_key_func;
FreeFunc free_value_func;
};
@@ -65,10 +65,10 @@ key_value_free (KeyValue *kv,
* Creates a new #HashTable.
*/
HashTable *
-hash_table_new (HashFunc hash_func,
- HashEqualFunc equal_func,
- FreeFunc free_key_func,
- FreeFunc free_value_func)
+hash_table_new (HashFunc hash_func,
+ EqualFunc equal_func,
+ FreeFunc free_key_func,
+ FreeFunc free_value_func)
{
HashTable *new = check_malloc (sizeof (HashTable));
diff --git a/lib/types/hashtable.h b/lib/types/hashtable.h
index bd7f71c..c71f049 100644
--- a/lib/types/hashtable.h
+++ b/lib/types/hashtable.h
@@ -7,7 +7,7 @@ typedef struct _HashTable HashTable;
HashTable * hash_table_new (HashFunc hash_func,
- HashEqualFunc equal_func,
+ EqualFunc equal_func,
FreeFunc free_key_func,
FreeFunc free_value_func);
void hash_table_free (HashTable *self);
diff --git a/lib/types/types.h b/lib/types/types.h
index c7c115b..7b59b91 100644
--- a/lib/types/types.h
+++ b/lib/types/types.h
@@ -8,10 +8,10 @@ typedef void (*ForEachFunc) (void *data,
typedef double (*ValueFunc) (const void *element);
typedef int (*CompareFunc) (const void *a,
const void *b);
+typedef bool (*EqualFunc) (const void *a,
+ const void *b);
-typedef unsigned (*HashFunc) (const void *key);
-typedef bool (*HashEqualFunc) (const void *a,
- const void *b);
-typedef void (*HashIterFunc) (void *key,
- void *value,
- void *user_data);
+typedef unsigned (*HashFunc) (const void *key);
+typedef void (*HashIterFunc) (void *key,
+ void *value,
+ void *user_data);
--
GitLab