emileclarkb/hammer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add h_hashtable_merge function

Browse source
This commit is contained in:
Sven M. Hallberg 2013-05-22 21:57:46 +02:00
parent 194ddee90b
commit e4d0b636dd
2 changed files with 21 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/datastructures.c
View file

@ -180,6 +180,25 @@ void h_hashtable_update(HHashTable *dst, const HHashTable *src) {
} }
} }
void h_hashtable_merge(void *(*combine)(void *v1, void *v2),
HHashTable *dst, const HHashTable *src) {
size_t i;
HHashTableEntry *hte;
for(i=0; i < src->capacity; i++) {
for(hte = &src->contents[i]; hte; hte = hte->next) {
if(hte->key == NULL)
continue;
void *oldvalue = h_hashtable_get(dst, hte->key);
void *newvalue;
if(oldvalue)
newvalue = combine(oldvalue, hte->value);
else
newvalue = hte->value;
h_hashtable_put(dst, hte->key, newvalue);
}
}
}
int h_hashtable_present(const HHashTable* ht, const void* key) { int h_hashtable_present(const HHashTable* ht, const void* key) {
HHashValue hashval = ht->hashFunc(key); HHashValue hashval = ht->hashFunc(key);
#ifdef CONSISTENCY_CHECK #ifdef CONSISTENCY_CHECK

2
src/internal.h
View file

@ -254,6 +254,8 @@ HHashTable* h_hashtable_new(HArena *arena, HEqualFunc equalFunc, HHashFunc hashF
void* h_hashtable_get(const HHashTable* ht, const void* key); void* h_hashtable_get(const HHashTable* ht, const void* key);
void h_hashtable_put(HHashTable* ht, const void* key, void* value); void h_hashtable_put(HHashTable* ht, const void* key, void* value);
void h_hashtable_update(HHashTable* dst, const HHashTable *src); void h_hashtable_update(HHashTable* dst, const HHashTable *src);
void h_hashtable_merge(void *(*combine)(void *v1, void *v2),
HHashTable *dst, const HHashTable *src);
int h_hashtable_present(const HHashTable* ht, const void* key); int h_hashtable_present(const HHashTable* ht, const void* key);
void h_hashtable_del(HHashTable* ht, const void* key); void h_hashtable_del(HHashTable* ht, const void* key);
void h_hashtable_free(HHashTable* ht); void h_hashtable_free(HHashTable* ht);