Dict const correctness

1 files changed, 15 insertions, 9 deletions

diff --git a/dict.c b/dict.c
index ba318cd..d7e14db 100644
--- a/dict.c
+++ b/dict.c
@@ -24,13 +24,14 @@ struct dict_entry {
 
 struct dict {
 	struct dict_entry *buckets[DICTTABLESIZE];
-	unsigned int (*key2hash) (void *);
-	int (*key_cmp) (void *, void *);
+	unsigned int (*key2hash) (const void *);
+	int (*key_cmp) (const void *, const void *);
 };
 
 Dict *
-dict_init(unsigned int (*key2hash) (void *),
-		       int (*key_cmp) (void *, void *)) {
+dict_init(unsigned int (*key2hash) (const void *),
+	  int (*key_cmp) (const void *, const void *))
+{
 	Dict *d;
 	int i;
 
@@ -103,7 +104,8 @@ dict_enter(Dict *d, void *key, void *value) {
 }
 
 void *
-dict_find_entry(Dict *d, void *key) {
+dict_find_entry(Dict *d, const void *key)
+{
 	unsigned int hash;
 	unsigned int bucketpos;
 	struct dict_entry *entry;
@@ -147,7 +149,8 @@ dict_apply_to_all(Dict *d,
 /*****************************************************************************/
 
 unsigned int
-dict_key2hash_string(void *key) {
+dict_key2hash_string(const void *key)
+{
 	const char *s = (const char *)key;
 	unsigned int total = 0, shift = 0;
 
@@ -163,19 +166,22 @@ dict_key2hash_string(void *key) {
 }
 
 int
-dict_key_cmp_string(void *key1, void *key2) {
+dict_key_cmp_string(const void *key1, const void *key2)
+{
 	assert(key1);
 	assert(key2);
 	return strcmp((const char *)key1, (const char *)key2);
 }
 
 unsigned int
-dict_key2hash_int(void *key) {
+dict_key2hash_int(const void *key)
+{
 	return (unsigned long)key;
 }
 
 int
-dict_key_cmp_int(void *key1, void *key2) {
+dict_key_cmp_int(const void *key1, const void *key2)
+{
 	return key1 - key2;
 }