hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
MassimilianoPinto
2014-02-14 10:54:06 +01:00
parent b673108276 5fd5aab2be
commit 7a5efb4e11
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/core/hashtable.c
View File

@ -184,6 +184,9 @@ hashtable_add(HASHTABLE *table, void *key, void *value)
int hashkey; int hashkey;
HASHENTRIES *entry; HASHENTRIES *entry;
if (key == NULL || value == NULL)
return 0;
if (table->hashsize <= 0) { if (table->hashsize <= 0) {
return 0; return 0;
} else { } else {
@ -209,8 +212,27 @@ hashtable_add(HASHTABLE *table, void *key, void *value)
hashtable_write_unlock(table); hashtable_write_unlock(table);
return 0; return 0;
} }
/* copy the key */
ptr->key = table->kcopyfn(key); ptr->key = table->kcopyfn(key);
/* check succesfull key copy */
if ( ptr->key == NULL) {
return 0;
}
/* copy the value */
ptr->value = table->vcopyfn(value); ptr->value = table->vcopyfn(value);
/* check succesfull value copy */
if ( ptr->value == NULL) {
/* remove the key ! */
table->kfreefn(ptr->key);
/* value not copied, return */
return 0;
}
ptr->next = table->entries[hashkey % table->hashsize]; ptr->next = table->entries[hashkey % table->hashsize];
table->entries[hashkey % table->hashsize] = ptr; table->entries[hashkey % table->hashsize] = ptr;
} }