From f43805d875ad5c672afbbfff48bded2087204773 Mon Sep 17 00:00:00 2001 From: Chantry Xavier Date: Sat, 10 May 2008 18:47:42 +0200 Subject: 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 Signed-off-by: Dan McGee --- lib/libalpm/group.h | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/libalpm/group.h') diff --git a/lib/libalpm/group.h b/lib/libalpm/group.h index 5f8fdec4..e261260c 100644 --- a/lib/libalpm/group.h +++ b/lib/libalpm/group.h @@ -30,7 +30,6 @@ struct __pmgrp_t { pmgrp_t *_alpm_grp_new(const char *name); void _alpm_grp_free(pmgrp_t *grp); -int _alpm_grp_cmp(const void *g1, const void *g2); #endif /* _ALPM_GROUP_H */ -- cgit v1.2.3-24-g4f1b