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

diff --git a/src/hash.c b/src/hash.c
index 8fb9ca69..5d90e55c 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -1,6 +1,6 @@
 /*
     hash.c -- hash table management
-    Copyright (C) 2012-2013 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
@@ -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 = xzalloc(sizeof *hash);
+	hash_t *hash = xzalloc(sizeof(*hash));
 	hash->n = n;
 	hash->size = size;
 	hash->keys = xzalloc(hash->n * hash->size);
-	hash->values = xzalloc(hash->n * sizeof *hash->values);
+	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,14 +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);
+	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);
+		memset(hash->values + hash->n, 0, (n - hash->n) * sizeof(*hash->values));
 	}
 }