Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=e8054fcd104a60545db7cbfcad1990478855fd3e
commit e8054fcd104a60545db7cbfcad1990478855fd3e Author: Michel Hermier <[email protected]> Date: Sat Aug 16 12:14:22 2014 +0200 libpacman: Drop _pacman_packagestrmatcher_* now unused code. diff --git a/lib/libpacman/db.cpp b/lib/libpacman/db.cpp index a3963e6..d009730 100644 --- a/lib/libpacman/db.cpp +++ b/lib/libpacman/db.cpp @@ -110,24 +110,23 @@ FPtrList *Database::filter(const FStringList *needles, int packagestrmatcher_fla for(i = needles; i; i = i->next) { FStrMatcher strmatcher = { NULL }; - FMatcher packagestrmatcher; const char *targ = f_stringlistitem_to_str(i); if(f_strempty(targ)) { continue; } _pacman_log(PM_LOG_DEBUG, "searching for target '%s'\n", targ); - if(f_strmatcher_init(&strmatcher, targ, strmatcher_flags) == 0 && - _pacman_packagestrmatcher_init(&packagestrmatcher, &strmatcher, packagestrmatcher_flags) == 0) { + if(f_strmatcher_init(&strmatcher, targ, strmatcher_flags) == 0) { + PackageMatcher packagematcher(&strmatcher, packagestrmatcher_flags); + for(j = _pacman_db_get_pkgcache(this); j; j = j->next) { Package *pkg = j->data; - if(f_match(pkg, &packagestrmatcher)) { + if(packagematcher.match(pkg)) { ret = f_ptrlist_append(ret, pkg); } } } - _pacman_packagestrmatcher_fini(&packagestrmatcher); f_strmatcher_fini(&strmatcher); } return(ret); diff --git a/lib/libpacman/package.cpp b/lib/libpacman/package.cpp index 7cfa3d9..0fff5b6 100644 --- a/lib/libpacman/package.cpp +++ b/lib/libpacman/package.cpp @@ -348,51 +348,6 @@ int _pacman_strmatcher_match(const FStrMatcher *strmatcher, Package *pkg, int fl } static -int _pacman_packagestrmatcher_match_cb(const void *ptr, const void *matcher_data) { - const FPackageStrMatcher *data = matcher_data; - - return _pacman_strmatcher_match(data->strmatcher, (const Package *)ptr, data->flags); -} - -int _pacman_packagestrmatcher_init(FMatcher *matcher, const FStrMatcher *strmatcher, int flags) -{ - FPackageStrMatcher *data = NULL; - - ASSERT(matcher != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); - ASSERT(strmatcher != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); - ASSERT((data = (FPackageStrMatcher *)f_zalloc(sizeof(*data))) != NULL, return -1); - - matcher->fn = _pacman_packagestrmatcher_match_cb; - matcher->data = data; - data->strmatcher = strmatcher; - data->flags = flags; - return 0; -} - -int _pacman_packagestrmatcher_fini(FMatcher *matcher) -{ - FPackageStrMatcher *data = NULL; - - ASSERT(matcher != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); - ASSERT(matcher->fn == _pacman_packagestrmatcher_match_cb, RET_ERR(PM_ERR_WRONG_ARGS, -1)); - ASSERT((data = (FPackageStrMatcher *)matcher->data) != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); - - free(data); - return 0; -} - -int _pacman_packagestrmatcher_match(const FMatcher *matcher, const Package *package, int mask) -{ - FPackageStrMatcher *data = NULL; - - ASSERT(matcher != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); - ASSERT(matcher->fn == _pacman_packagestrmatcher_match_cb, RET_ERR(PM_ERR_WRONG_ARGS, -1)); - ASSERT((data = (FPackageStrMatcher *)matcher->data) != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); - - return _pacman_strmatcher_match(data->strmatcher, package, data->flags & mask); -} - -static int PackageMatcher_match_cb(const void *ptr, const void *matcher_data) { return ((const PackageMatcher *)matcher_data)->match((const Package *)ptr); diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index 62044a2..7ee6d18 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -192,11 +192,6 @@ int _pacman_pkg_delete(libpacman::Package *self); int _pacman_pkg_cmp(const void *p1, const void *p2); libpacman::Package *_pacman_pkg_isin(const char *needle, pmlist_t *haystack); -int _pacman_packagestrmatcher_init(FMatcher *matcher, const FStrMatcher *strmatcher, int flags); -int _pacman_packagestrmatcher_fini(FMatcher *matcher); - -int _pacman_packagestrmatcher_match(const FMatcher *matcher, const libpacman::Package *package, int mask = ~0); - #endif /* _PACMAN_PACKAGE_H */ /* vim: set ts=2 sw=2 noet: */ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
