moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-08-13 17:03:46 -04:00
Code Issues Releases Wiki Activity

Refactor out common code in pkghash add functions

Browse Source 
The overlapping code in _alpm_pkghash_add() and _alpm_pkghash_add_sorted()
are now in a new static function pkghash_add_pkg(). This function has a
third flag parameter which determines whether the package should be added in
sorted order.

Signed-off-by: Pang Yan Han <pangyanhan@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Pang Yan Han 2011-02-08 07:15:13 +08:00 committed by Dan McGee
parent be9a60a338
commit da3b934602
1 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/libalpm/pkghash.c
View File

@ -148,7 +148,7 @@ static pmpkghash_t *rehash(pmpkghash_t *oldhash)
return(newhash); return(newhash);
} }
pmpkghash_t *_alpm_pkghash_add(pmpkghash_t *hash, pmpkg_t *pkg) static pmpkghash_t *pkghash_add_pkg(pmpkghash_t *hash, pmpkg_t *pkg, int sorted)
{ {
alpm_list_t *ptr; alpm_list_t *ptr;
size_t position; size_t position;
@ -173,41 +173,24 @@ pmpkghash_t *_alpm_pkghash_add(pmpkghash_t *hash, pmpkg_t *pkg)
ptr->prev = ptr; ptr->prev = ptr;
hash->hash_table[position] = ptr; hash->hash_table[position] = ptr;
hash->list = alpm_list_join(hash->list, ptr); if(!sorted){
hash->entries += 1; hash->list = alpm_list_join(hash->list, ptr);
}else{
hash->list = alpm_list_mmerge(hash->list, ptr, _alpm_pkg_cmp);
}
hash->entries += 1;
return(hash); return(hash);
} }
pmpkghash_t *_alpm_pkghash_add(pmpkghash_t *hash, pmpkg_t *pkg)
{
return(pkghash_add_pkg(hash, pkg, 0));
}
pmpkghash_t *_alpm_pkghash_add_sorted(pmpkghash_t *hash, pmpkg_t *pkg) pmpkghash_t *_alpm_pkghash_add_sorted(pmpkghash_t *hash, pmpkg_t *pkg)
{ {
if(!hash) { return(pkghash_add_pkg(hash, pkg, 1));
return(_alpm_pkghash_add(hash, pkg));
}
alpm_list_t *ptr;
size_t position;
if((hash->entries + 1) / MAX_HASH_LOAD > hash->buckets) {
hash = rehash(hash);
}
position = get_hash_position(pkg->name_hash, hash);
ptr = calloc(1, sizeof(alpm_list_t));
if(ptr == NULL) {
return(hash);
}
ptr->data = pkg;
ptr->next = NULL;
ptr->prev = ptr;
hash->hash_table[position] = ptr;
hash->list = alpm_list_mmerge(hash->list, ptr, _alpm_pkg_cmp);
hash->entries += 1;
return(hash);
} }
static size_t move_one_entry(pmpkghash_t *hash, size_t start, size_t end) static size_t move_one_entry(pmpkghash_t *hash, size_t start, size_t end)
@ -344,3 +327,5 @@ pmpkg_t *_alpm_pkghash_find(pmpkghash_t *hash, const char *name)
return(NULL); return(NULL);
} }
/* vim: set ts=2 sw=2 noet: */