X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fhash.c;h=5d90e55c68fdf7d44d0343fc28c4d5709bfef955;hb=6bf3ea32f0afa91f1fed494542e873ca6abca9c9;hp=cf5ba90a08e13e5dec7ef4e6bf23d7e2347b749b;hpb=0ed0cc6f9c30537bd74222fd99a41726d488dd37;p=meshlink

diff --git a/src/hash.c b/src/hash.c
index cf5ba90a..5d90e55c 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -1,6 +1,6 @@
 /*
     hash.c -- hash table management
-    Copyright (C) 2012 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@ static uint32_t hash_function(const void *p, size_t len) {
 	uint32_t hash = 0;
 	while(true) {
 		for(int i = len > 4 ? 4 : len; --i;)
-			hash += q[i] << (8 * i);
+			hash += q[len - i] << (8 * i);
 		hash *= 0x9e370001UL; // Golden ratio prime.
 		if(len <= 4)
 			break;
@@ -52,11 +52,11 @@ static uint32_t modulo(uint32_t hash, size_t n) {
 /* (De)allocation */
 
 hash_t *hash_alloc(size_t n, size_t size) {
-	hash_t *hash = xmalloc_and_zero(sizeof *hash);
+	hash_t *hash = xzalloc(sizeof(*hash));
 	hash->n = n;
 	hash->size = size;
-	hash->keys = xmalloc(hash->n * hash->size);
-	hash->values = xmalloc_and_zero(hash->n * sizeof *hash->values);
+	hash->keys = xzalloc(hash->n * hash->size);
+	hash->values = xzalloc(hash->n * sizeof(*hash->values));
 	return hash;
 }
 
@@ -76,9 +76,8 @@ void hash_insert(hash_t *hash, const void *key, const void *value) {
 
 void *hash_search(const hash_t *hash, const void *key) {
 	uint32_t i = modulo(hash_function(key, hash->size), hash->n);
-	if(hash->values[i] && !memcmp(key, hash->keys + i * hash->size, hash->size)) {
+	if(hash->values[i] && !memcmp(key, hash->keys + i * hash->size, hash->size))
 		return (void *)hash->values[i];
-	}
 	return NULL;
 }
 
@@ -94,12 +93,14 @@ void *hash_search_or_insert(hash_t *hash, const void *key, const void *value) {
 /* Utility functions */
 
 void hash_clear(hash_t *hash) {
-	memset(hash->values, 0, hash->n * sizeof *hash->values);
+	memset(hash->values, 0, hash->n * sizeof(*hash->values));
 }
 
 void hash_resize(hash_t *hash, size_t n) {
 	hash->keys = xrealloc(hash->keys, n * hash->size);
-	hash->values = xrealloc(hash->values, n * sizeof *hash->values);
-	if(n > hash->n)
-		memset(hash->values + hash->n, 0, (n - hash->n) * sizeof *hash->values);
+	hash->values = xrealloc(hash->values, n * sizeof(*hash->values));
+	if(n > hash->n) {
+		memset(hash->keys + hash->n * hash->size, 0, (n - hash->n) * hash->size);
+		memset(hash->values + hash->n, 0, (n - hash->n) * sizeof(*hash->values));
+	}
 }