Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=9201ec4ff633dfb9ac8963febcf1fd4ea555032f
commit 9201ec4ff633dfb9ac8963febcf1fd4ea555032f Author: Michel Hermier <[email protected]> Date: Mon Aug 18 21:42:31 2014 +0200 libpacman: Also drop _pacman_list_new. diff --git a/lib/libpacman/db.cpp b/lib/libpacman/db.cpp index 455829c..dc9e6af 100644 --- a/lib/libpacman/db.cpp +++ b/lib/libpacman/db.cpp @@ -177,7 +177,7 @@ FPtrList *Database::whatPackagesProvide(const char *target) pmlist_t *Database::test() const { /* testing sync dbs is not supported */ - return _pacman_list_new(); + return f_ptrlist_new(); } int Database::open(int flags) diff --git a/lib/libpacman/db/localdb.cpp b/lib/libpacman/db/localdb.cpp index 9f7b62f..67682f7 100644 --- a/lib/libpacman/db/localdb.cpp +++ b/lib/libpacman/db/localdb.cpp @@ -256,7 +256,7 @@ pmlist_t *LocalDatabase::test() const struct dirent *ent; char path[PATH_MAX]; struct stat buf; - pmlist_t *ret = _pacman_list_new(); + pmlist_t *ret = f_ptrlist_new(); while ((ent = readdir(m_dir)) != NULL) { snprintf(path, PATH_MAX, "%s/%s", this->path, ent->d_name); diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index 5131469..86c43c0 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -526,7 +526,7 @@ int __pmtrans_t::prepare(pmlist_t **data) } if(!(flags & PM_TRANS_FLAG_NODEPS)) { - trail = _pacman_list_new(); + trail = f_ptrlist_new(); /* Resolve targets dependencies */ EVENT(this, PM_TRANS_EVT_RESOLVEDEPS_START, NULL, NULL); diff --git a/lib/libpacman/util/fptrlist.c b/lib/libpacman/util/fptrlist.c index a090575..f8898ba 100644 --- a/lib/libpacman/util/fptrlist.c +++ b/lib/libpacman/util/fptrlist.c @@ -37,7 +37,7 @@ FPtrList *f_ptrlist_add_sorted(FPtrList *list, void *data, _pacman_fn_cmp fn) { FPtrListItem *add, *end = f_ptrlist_end(list), *prev = NULL, *iter = f_ptrlist_first(list); - add = _pacman_list_new(); + add = f_ptrlist_new(); add->data = data; /* Find insertion point. */ diff --git a/lib/libpacman/util/fptrlist.h b/lib/libpacman/util/fptrlist.h index 52d6e34..f61ea4d 100644 --- a/lib/libpacman/util/fptrlist.h +++ b/lib/libpacman/util/fptrlist.h @@ -57,8 +57,6 @@ typedef struct FPtrListItem FPtrListItem; /* Sort comparison callback function declaration */ typedef int (*_pacman_fn_cmp)(const void *, const void *); -#define _pacman_list_new f_ptrlist_new - FPtrList *f_ptrlist_add_sorted(FPtrList *list, void *data, _pacman_fn_cmp fn); FPtrList *_pacman_list_remove(FPtrList *haystack, void *needle, _pacman_fn_cmp fn, void **data); FPtrList *_pacman_list_reverse(FPtrList *list); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
