projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert sizeof foo to sizeof(foo).
[tinc]
/
src
/
hash.c
diff --git
a/src/hash.c
b/src/hash.c
index
8fb9ca6
..
f27b257
100644
(file)
--- a/
src/hash.c
+++ b/
src/hash.c
@@
-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;)
uint32_t hash = 0;
while(true) {
for(int i = len > 4 ? 4 : len; --i;)
- hash += q[len - i] << (8 * i);
+ hash +=
(uint32_t)
q[len - i] << (8 * i);
hash *= 0x9e370001UL; // Golden ratio prime.
if(len <= 4)
break;
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) {
/* (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->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;
}
return hash;
}
@@
-91,17
+91,24
@@
void *hash_search_or_insert(hash_t *hash, const void *key, const void *value) {
return NULL;
}
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) {
/* 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);
}
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);
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)
);
}
}
}
}