X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fhash.h;h=11d132a49f9bb3f49cd1facbee72b56f586dda49;hb=1022812ed4b5c70162f2f0a9d9a96c716c936408;hp=45cf64101c965575b8443faa77a673b2279af3f1;hpb=9a018c2e371eb1cef9708ac71653f2f2868895fa;p=tinc

diff --git a/src/hash.h b/src/hash.h
index 45cf6410..11d132a4 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -43,21 +43,21 @@ uint32_t modulo(uint32_t hash, size_t n);
 	void hash_insert_ ## t (hash_ ##t *hash, const t *key, const void *value) { \
 		uint32_t i = hash_modulo_ ## t(hash_function_ ## t(key)); \
 		for(uint8_t f=0; f< (HASH_SEARCH_ITERATIONS - 1); f++){ \
-			if(hash->values[i] == NULL || !memcmp(key, &hash->keys[i], sizeof(#t))) { \
-				memcpy(&hash->keys[i], key, sizeof(#t)); \
+			if(hash->values[i] == NULL || !memcmp(key, &hash->keys[i], sizeof(t))) { \
+				memcpy(&hash->keys[i], key, sizeof(t)); \
 				hash->values[i] = value; \
 				return; \
 			} \
 			if(++i == n) i = 0; \
 		} \
 		/* We always pick the last slot. It's unfair. But thats life */ \
-		memcpy(&hash->keys[i], key, sizeof(#t)); \
+		memcpy(&hash->keys[i], key, sizeof(t)); \
 		hash->values[i] = value; \
 	} \
 	void *hash_search_ ## t (const hash_ ##t *hash, const t *key) { \
 		uint32_t i = hash_modulo_ ## t(hash_function_ ## t(key)); \
 		for(uint8_t f=0; f<HASH_SEARCH_ITERATIONS; f++){ \
-			if(!memcmp(key, &hash->keys[i], sizeof(#t))) { \
+			if(!memcmp(key, &hash->keys[i], sizeof(t))) { \
 				return (void *)hash->values[i]; \
 			} \
 			if(++i == n) i = 0; \
@@ -67,7 +67,7 @@ uint32_t modulo(uint32_t hash, size_t n);
 	void hash_delete_ ## t (hash_ ##t *hash, const t *key) { \
 		uint32_t i = hash_modulo_ ## t(hash_function_ ## t(key)); \
 		for(uint8_t f=0; f<HASH_SEARCH_ITERATIONS; f++){ \
-			if(!memcmp(key, &hash->keys[i], sizeof(#t))) { \
+			if(!memcmp(key, &hash->keys[i], sizeof(t))) { \
 				hash->values[i] = NULL; \
 				return; \
 			} \
@@ -76,6 +76,7 @@ uint32_t modulo(uint32_t hash, size_t n);
 	} \
 	void hash_clear_ ## t(hash_ ##t *hash) { \
 		memset(hash->values, 0, n * sizeof(*hash->values)); \
+		memset(hash->keys, 0, n * sizeof(*hash->keys)); \
 	}