Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=82c8f0cee46de15906a75d43411ac11bbf63b281
commit 82c8f0cee46de15906a75d43411ac11bbf63b281 Author: Michel Hermier <[email protected]> Date: Fri Aug 15 12:25:52 2014 +0200 libpacman: For the sake of simplicity invert packagestrmatcher_flags and strmatcher_flags in Database::find methods. diff --git a/lib/libpacman/db.cpp b/lib/libpacman/db.cpp index 8d78668..93fdc17 100644 --- a/lib/libpacman/db.cpp +++ b/lib/libpacman/db.cpp @@ -111,7 +111,7 @@ pmlist_t *Database::filter(const FStrMatcher *strmatcher, int packagestrmatcher_ return ret; } -FPtrList *Database::filter(const FStringList *needles, int strmatcher_flags, int packagestrmatcher_flags) +FPtrList *Database::filter(const FStringList *needles, int packagestrmatcher_flags, int strmatcher_flags) { pmlist_t *i, *j, *ret = NULL; @@ -140,7 +140,7 @@ FPtrList *Database::filter(const FStringList *needles, int strmatcher_flags, int return(ret); } -FPtrList *Database::filter(const char *target, int strmatcher_flags, int packagestrmatcher_flags) +FPtrList *Database::filter(const char *target, int packagestrmatcher_flags, int strmatcher_flags) { FPtrList *ret = NULL; FStrMatcher strmatcher = { NULL }; @@ -189,7 +189,7 @@ Package *Database::find(const char *target) return _pacman_pkg_isin(target, _pacman_db_get_pkgcache(this)); } -Package *Database::find(const char *target, int strmatcher_flags, int packagestrmatcher_flags) +Package *Database::find(const char *target, int packagestrmatcher_flags, int strmatcher_flags) { Package *ret = NULL; FStrMatcher strmatcher = { NULL }; @@ -204,7 +204,7 @@ Package *Database::find(const char *target, int strmatcher_flags, int packagestr FPtrList *Database::whatPackagesProvide(const char *target) { - return filter(target, F_STRMATCHER_EQUAL, PM_PACKAGE_FLAG_PROVIDES); + return filter(target, PM_PACKAGE_FLAG_PROVIDES); } pmlist_t *Database::test() const diff --git a/lib/libpacman/db.h b/lib/libpacman/db.h index 2a7896a..4b25e4f 100644 --- a/lib/libpacman/db.h +++ b/lib/libpacman/db.h @@ -69,15 +69,12 @@ public: // Cache operations pmlist_t *filter(const FMatcher *packagestrmatcher); pmlist_t *filter(const FStrMatcher *strmatcher, int packagestrmatcher_flags); - FPtrList *filter(const FStringList *needles, - int strmatcher_flags = F_STRMATCHER_ALL_IGNORE_CASE, - int packagestrmatcher_flags = PM_PACKAGE_FLAG_NAME | PM_PACKAGE_FLAG_DESCRIPTION | PM_PACKAGE_FLAG_PROVIDES); - FPtrList *filter(const char *target, int strmatcher_flags, int packagestrmatcher_flags); + FPtrList *filter(const FStringList *needles, int packagestrmatcher_flags, int strmatcher_flags = F_STRMATCHER_EQUAL); + FPtrList *filter(const char *target, int packagestrmatcher_flags, int strmatcher_flags = F_STRMATCHER_EQUAL); libpacman::Package *find(const FMatcher *packagestrmatcher); libpacman::Package *find(const FStrMatcher *strmatcher, int packagestrmatcher_flags); libpacman::Package *find(const char *target); - libpacman::Package *find(const char *target, int strmatcher_flags, - int packagestrmatcher_flags = PM_PACKAGE_FLAG_NAME); + libpacman::Package *find(const char *target, int packagestrmatcher_flags, int strmatcher_flags = F_STRMATCHER_EQUAL); FPtrList *whatPackagesProvide(const char *target); virtual pmlist_t *getowners(const char *filename); /* Make pure virtual */ diff --git a/lib/libpacman/pacman.cpp b/lib/libpacman/pacman.cpp index 7641fb0..15a5016 100644 --- a/lib/libpacman/pacman.cpp +++ b/lib/libpacman/pacman.cpp @@ -1029,7 +1029,9 @@ pmlist_t *pacman_db_search(pmdb_t *_db) ASSERT(handle->needles->data != NULL, return(NULL)); ASSERT(db != NULL, return(NULL)); - ret = db->filter(handle->needles); + ret = db->filter(handle->needles, + PM_PACKAGE_FLAG_NAME | PM_PACKAGE_FLAG_DESCRIPTION | PM_PACKAGE_FLAG_PROVIDES, + F_STRMATCHER_ALL_IGNORE_CASE); FREELIST(handle->needles); return(ret); } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
