Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=40b45ad04ed429f8b61df7bbfefbb79f45c2bb4b
commit 40b45ad04ed429f8b61df7bbfefbb79f45c2bb4b Author: Michel Hermier <[email protected]> Date: Mon Sep 8 21:52:20 2014 +0200 libpacman: Drop FREELISTPTR. diff --git a/lib/libpacman/deps.cpp b/lib/libpacman/deps.cpp index 5229d24..d50e792 100644 --- a/lib/libpacman/deps.cpp +++ b/lib/libpacman/deps.cpp @@ -723,7 +723,7 @@ int inList(FPtrList *lst, char *lItem) { } extern "C" { -int pacman_output_generate(FPtrList *targets, FPtrList *dblist) { +int pacman_output_generate(FStringList *targets, FPtrList *dblist) { FStringList found; Package *pkg = NULL; char *match = NULL; @@ -761,7 +761,6 @@ int pacman_output_generate(FPtrList *targets, FPtrList *dblist) { db->rewind(); } while(foundMatch); } - FREELISTPTR(targets); printf("\n"); return 0; } diff --git a/lib/libpacman/server.cpp b/lib/libpacman/server.cpp index 719acb3..8743cdd 100644 --- a/lib/libpacman/server.cpp +++ b/lib/libpacman/server.cpp @@ -57,7 +57,7 @@ pmserver_t *_pacman_server_new(char *url) char *ptr; if(server == NULL) { - return(NULL); + return NULL; } /* parse our special url */ @@ -105,8 +105,7 @@ pmserver_t *_pacman_server_new(char *url) } else { RET_ERR(PM_ERR_SERVER_PROTOCOL_UNSUPPORTED, NULL); } - - return(server); + return server; } void _pacman_server_free(void *data) diff --git a/lib/libpacman/util/fptrlist.h b/lib/libpacman/util/fptrlist.h index 521e125..299336a 100644 --- a/lib/libpacman/util/fptrlist.h +++ b/lib/libpacman/util/fptrlist.h @@ -35,16 +35,13 @@ typedef struct FPtrListItem FPtrListIterator; #else /* __cplusplus */ typedef class FPtrList FPtrList; typedef class FPtrListItem FPtrListIterator; -#endif /* __cplusplus */ -#ifdef __cplusplus extern "C" { #endif /* __cplusplus */ #define _FREELIST(p, f) do { if(p) { FVisitor visitor = { (FVisitorFunc)f, NULL }; f_ptrlist_delete(p, &visitor); p = NULL; } } while(0) #define FREELIST(p) _FREELIST(p, free) -#define FREELISTPTR(p) _FREELIST(p, NULL) /* Sort comparison callback function declaration */ typedef int (*_pacman_fn_cmp)(const void *, const void *); @@ -76,9 +73,7 @@ const FPtrListIterator *f_ptrlist_rend_const(const FPtrList *self); #ifdef __cplusplus } -#endif /* __cplusplus */ -#ifdef __cplusplus class FPtrListItem : public FListItem<void *> { @@ -224,7 +219,7 @@ private: FPtrList(const FPtrList &o); FPtrList &operator = (const FPtrList &o); }; -#endif +#endif /* __cplusplus */ #endif /* F_PTRLIST_H */ /* vim: set ts=2 sw=2 noet: */ diff --git a/src/pacman-g2/ps.c b/src/pacman-g2/ps.c index 7cceff0..d00e599 100644 --- a/src/pacman-g2/ps.c +++ b/src/pacman-g2/ps.c @@ -236,7 +236,7 @@ int pspkg(int countonly) } count++; } - FREELISTPTR(ret); + f_ptrlist_delete(ret, NULL); end_lsof(fpout, pid); diff --git a/src/pacman-g2/sync.c b/src/pacman-g2/sync.c index 14d11ae..e35c081 100644 --- a/src/pacman-g2/sync.c +++ b/src/pacman-g2/sync.c @@ -198,7 +198,7 @@ static int sync_info(FStringList *targets) static int sync_list(FStringList *targets) { - list_t *ls = NULL; + FPtrList *ls = NULL; if(targets) { for(FPtrListIterator *i = f_ptrlist_first(targets), *end = f_ptrlist_end(targets); i != end; i = f_ptrlistitem_next(i)) { @@ -214,14 +214,14 @@ static int sync_list(FStringList *targets) if(db == NULL) { ERR(NL, _("repository \"%s\" was not found.\n"), (char *)list_data(i)); - FREELISTPTR(ls); - return(1); + f_ptrlist_delete(ls, NULL); + return 1; } ls = f_ptrlist_add(ls, db); } } else { - ls = pmc_syncs; + ls = (FPtrList *)pmc_syncs; } for(FPtrListIterator *i = f_ptrlist_first(ls), *end = f_ptrlist_end(ls); i != end; i = f_ptrlistitem_next(i)) { @@ -236,12 +236,10 @@ static int sync_list(FStringList *targets) (char *)pacman_pkg_getinfo(pkg, PM_PKG_VERSION)); } } - if(targets) { - FREELISTPTR(ls); + f_ptrlist_delete(ls, NULL); } - - return(0); + return 0; } int syncpkg(FStringList *targets) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
