X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fhash.c;h=50934d9b99dc53c01fe4a220f6cf3ab304a58e53;hp=36b510c28640db7647a69377d82c99de47062ffd;hb=0c7e0210d900185d4c1a9ffd969dc2a26d9523a9;hpb=5b07039b0712bee0f19749d63116a10fb08a2d8b diff --git a/src/hash.c b/src/hash.c index 36b510c2..50934d9b 100644 --- a/src/hash.c +++ b/src/hash.c @@ -1,6 +1,6 @@ /* hash.c -- hash table management - Copyright (C) 2012 Guus Sliepen + Copyright (C) 2012-2013 Guus Sliepen 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 += (uint32_t)q[len - i] << (8 * i); hash *= 0x9e370001UL; // Golden ratio prime. if(len <= 4) break; @@ -91,6 +91,13 @@ void *hash_search_or_insert(hash_t *hash, const void *key, const void *value) { return NULL; } +/* Deleting */ + +void hash_delete(hash_t *hash, const void *key) { + uint32_t i = modulo(hash_function(key, hash->size), hash->n); + hash->values[i] = NULL; +} + /* Utility functions */ void hash_clear(hash_t *hash) {