From cf94007aed7eb87a38090a62b9ddf606ea1343c9 Mon Sep 17 00:00:00 2001 From: Aurelien Foret Date: Wed, 18 Jan 2006 22:37:16 +0000 Subject: more code cleanup yet --- lib/libalpm/package.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'lib/libalpm/package.c') diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index eda87f18..bf5585d2 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -373,30 +373,23 @@ error: /* Test for existence of a package in a PMList* * of pmpkg_t* - * - * returns: 0 for no match - * 1 for identical match - * -1 for name-only match (version mismatch) */ -int pkg_isin(pmpkg_t *needle, PMList *haystack) +pmpkg_t *pkg_isin(char *needle, PMList *haystack) { PMList *lp; if(needle == NULL || haystack == NULL) { - return(0); + return(NULL); } for(lp = haystack; lp; lp = lp->next) { pmpkg_t *info = lp->data; - if(info && !strcmp(info->name, needle->name)) { - if(!strcmp(info->version, needle->version)) { - return(1); - } - return(-1); + if(info && !strcmp(info->name, needle)) { + return(lp->data); } } - return(0); + return(NULL); } int pkg_splitname(char *target, char *name, char *version) -- cgit v1.2.3