archive/dlight
Archived
1
0
Fork 0
Code Activity

hash: Replace struct with a primitive type for hash values.

Browse source 
Remove the struct hash_entry and define a new type for hash values.
Most likely we will only need one member in this struct. and instead
of just using unsinged int. let's name a new type for clarity.
This commit is contained in:
Henrik Hautakoski 2012-08-22 15:16:27 +02:00
parent 569d0167d8
commit 223706d52f
3 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

32
hash.c
View file

@ -23,12 +23,12 @@
#define TABLE_MIN_SIZE 128
unsigned hash_sdbm(const char *s) {
hash_t hash_sdbm(const char *s) {
unsigned h;
hash_t h;
for(h = 0; *s; s++)
h = ((unsigned)*s) + (h << 6) + (h << 16) - h;
h = ((hash_t)*s) + (h << 6) + (h << 16) - h;
return h;
}
@ -46,33 +46,33 @@ void hash_free(struct hash_table *table) {
hash_init(table);
}
static struct hash_entry** lookup(const struct hash_table *t, unsigned hash) {
static hash_t** lookup(const struct hash_table *t, hash_t hash) {
unsigned i = hash % t->size;
struct hash_entry **table = t->ptr;
hash_t **table = t->ptr;
while(table[i]) {
if (table[i]->hash == hash)
if (*table[i] == hash)
break;
i = (i + 1) % t->size;
}
return table + i;
}
void* hash_lookup(const struct hash_table *t, unsigned hash) {
void* hash_lookup(const struct hash_table *t, hash_t hash) {
if (t->size < 1)
return NULL;
return *lookup(t, hash);
}
static void* insert(struct hash_table *t, unsigned hash, void *ptr) {
static void* insert(struct hash_table *t, hash_t hash, void *ptr) {
struct hash_entry **dest = lookup(t, hash);
hash_t **dest = lookup(t, hash);
if (!*dest) {
*dest = ptr;
(*dest)->hash = hash;
**dest = hash;
t->count++;
return NULL;
}
@ -92,7 +92,7 @@ static unsigned needs_resize(const struct hash_table *t) {
static void resize(struct hash_table *t) {
unsigned int i, old_size = t->size;
struct hash_entry **old = t->ptr;
hash_t **old = t->ptr;
/*
* set size to a load factor that is in the
@ -107,24 +107,24 @@ static void resize(struct hash_table *t) {
if (old) {
for(i=0; i < old_size; i++) {
struct hash_entry *entry = old[i];
hash_t *entry = old[i];
if (entry)
insert(t, entry->hash, entry);
insert(t, *entry, entry);
}
free(old);
}
}
void* hash_insert(struct hash_table *t, unsigned hash, void *ptr) {
void* hash_insert(struct hash_table *t, hash_t hash, void *ptr) {
if (needs_resize(t))
resize(t);
return insert(t, hash, ptr);
}
void* hash_remove(struct hash_table *t, unsigned hash) {
void* hash_remove(struct hash_table *t, hash_t hash) {
struct hash_entry **dest = lookup(t, hash);
hash_t **dest = lookup(t, hash);
if (*dest) {
void *ptr = *dest;