archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

remove paranoid null check from BLI_ghash_lookup(), was the only ghash function with a null check, callers better check the ghash exists first.

Browse Source
This commit is contained in:
Campbell Barton
2013-02-03 15:03:55 +00:00
parent b31d9c6cd0
commit bc3cb6ff76
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/blenlib/intern/BLI_ghash.c
View File

@@ -78,9 +78,9 @@ void BLI_ghash_insert(GHash *gh, void *key, void *val)
unsigned int hash = gh->hashfp(key) % gh->nbuckets; unsigned int hash = gh->hashfp(key) % gh->nbuckets;
Entry *e = (Entry *)BLI_mempool_alloc(gh->entrypool); Entry *e = (Entry *)BLI_mempool_alloc(gh->entrypool);
e->next = gh->buckets[hash];
e->key = key; e->key = key;
e->val = val; e->val = val;
e->next = gh->buckets[hash];
gh->buckets[hash] = e; gh->buckets[hash] = e;
if (++gh->nentries > (float)gh->nbuckets / 2) { if (++gh->nentries > (float)gh->nbuckets / 2) {
@@ -109,13 +109,13 @@ void BLI_ghash_insert(GHash *gh, void *key, void *val)
void *BLI_ghash_lookup(GHash *gh, const void *key) void *BLI_ghash_lookup(GHash *gh, const void *key)
{ {
if (gh) { const unsigned int hash = gh->hashfp(key) % gh->nbuckets;
unsigned int hash = gh->hashfp(key) % gh->nbuckets; Entry *e;
Entry *e;
for (e = gh->buckets[hash]; e; e = e->next) for (e = gh->buckets[hash]; e; e = e->next) {
if (gh->cmpfp(key, e->key) == 0) if (gh->cmpfp(key, e->key) == 0) {
return e->val; return e->val;
}
} }
return NULL; return NULL;
} }