qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 22:31:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[hash] Clean up some duplicate code

Browse source 
Hash_Add and Hash_AddElement differed by only one line: the hash
calculation.
This commit is contained in:
Bill Currie 2022-05-12 18:12:37 +09:00
parent f91167d74a
commit b7b6d4ad12
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libs/util/hash.c
View file

@ -242,10 +242,9 @@ Hash_FlushTable (hashtab_t *tab)
tab->num_ele = 0;
}
VISIBLE int
Hash_Add (hashtab_t *tab, void *ele)
static int
hash_add_element (hashtab_t *tab, uintptr_t h, void *ele)
{
uintptr_t h = Hash_String (tab->get_key(ele, tab->user_data));
size_t ind = get_index (h, tab->tab_size, tab->size_bits);
hashlink_t *lnk = new_hashlink (tab->hashlink_freelist);
@ -261,23 +260,18 @@ Hash_Add (hashtab_t *tab, void *ele)
return 0;
}
VISIBLE int
Hash_Add (hashtab_t *tab, void *ele)
{
uintptr_t h = Hash_String (tab->get_key(ele, tab->user_data));
return hash_add_element (tab, h, ele);
}
VISIBLE int
Hash_AddElement (hashtab_t *tab, void *ele)
{
uintptr_t h = tab->get_hash (ele, tab->user_data);
size_t ind = get_index (h, tab->tab_size, tab->size_bits);
hashlink_t *lnk = new_hashlink (tab->hashlink_freelist);
if (!lnk)
return -1;
if (tab->tab[ind])
tab->tab[ind]->prev = &lnk->next;
lnk->next = tab->tab[ind];
lnk->prev = &tab->tab[ind];
lnk->data = ele;
tab->tab[ind] = lnk;
tab->num_ele++;
return 0;
return hash_add_element (tab, h, ele);
}
VISIBLE void *