diff options
| author | Chantry Xavier <shiningxc@gmail.com> | 2008-05-10 18:47:42 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-05-13 22:49:02 +0200 |
| commit | f43805d875ad5c672afbbfff48bded2087204773 (patch) | |
| tree | 6cfc9e8ea40230aa1ec3349361f6f1f1fad63f37 /lib/libalpm/package.c | |
| parent | 8248b4bfb1abe175d73e20106a18172da5296836 (diff) | |
| download | pacman-f43805d875ad5c672afbbfff48bded2087204773.tar.gz pacman-f43805d875ad5c672afbbfff48bded2087204773.tar.xz | |
Cleanup usages of alpm_list_find and alpm_list_remove.
* remove obsolete and unused *_cmp helper functions like deppkg_cmp and
_alpm_grp_cmp
* new alpm_list_remove_str function, used 6 times in handle.c
* remove _alpm_prov_cmp / _alpm_db_whatprovides and replace them by
a more general alpm_find_pkg_satisfiers with a cleaner implementation.
before: alpm_db_whatprovides(db, targ)
after: alpm_find_pkg_satisfiers(alpm_db_getpkgcache(db), targ)
* remove satisfycmp and replace alpm_list_find + satisfycmp usage by
_alpm_find_dep_satisfiers.
before : alpm_list_find(_alpm_db_get_pkgcache(db), dep, satisfycmp)
after : _alpm_find_dep_satisfiers(_alpm_db_get_pkgcache(db), dep)
* remove _alpm_pkgname_pkg_cmp, which was used with alpm_list_remove, and
use _alpm_pkg_find + alpm_list_remove with _alpm_pkg_cmp instead.
This commit actually get rids of all complicated and asymmetric _cmp
functions. I first thought these functions were worth it, be caused it
allowed us to reuse list_find and list_remove. But this was at the detriment
of the clarity and also the ease of use of these functions, dangerous
because of their asymmetricity.
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/package.c')
| -rw-r--r-- | lib/libalpm/package.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index eabb2f3e..c39eae32 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -837,15 +837,9 @@ int _alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg) */ int _alpm_pkg_cmp(const void *p1, const void *p2) { - pmpkg_t *pk1 = (pmpkg_t *)p1; - pmpkg_t *pk2 = (pmpkg_t *)p2; - - return(strcmp(alpm_pkg_get_name(pk1), alpm_pkg_get_name(pk2))); -} - -int _alpm_pkgname_pkg_cmp(const void *pkgname, const void *package) -{ - return(strcmp(alpm_pkg_get_name((pmpkg_t *) package), (char *) pkgname)); + pmpkg_t *pkg1 = (pmpkg_t *)p1; + pmpkg_t *pkg2 = (pmpkg_t *)p2; + return(strcmp(alpm_pkg_get_name(pkg1), alpm_pkg_get_name(pkg2))); } /* Test for existence of a package in a alpm_list_t* |