Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=f8b52c519e72e969d8508ee2f7bcf56bb7dbdd02
commit f8b52c519e72e969d8508ee2f7bcf56bb7dbdd02 Author: Michel Hermier <[email protected]> Date: Mon Aug 18 21:38:54 2014 +0200 libpacman: Remove some _pacman_list_* define aliases. diff --git a/lib/libpacman/cache.cpp b/lib/libpacman/cache.cpp index 21b7559..832229b 100644 --- a/lib/libpacman/cache.cpp +++ b/lib/libpacman/cache.cpp @@ -73,7 +73,7 @@ int _pacman_db_load_pkgcache(Database *db) db->rewind(); while((info = db->readpkg(inforeq)) != NULL) { /* add to the collective */ - db->pkgcache = _pacman_list_add_sorted(db->pkgcache, info, _pacman_pkg_cmp); + db->pkgcache = f_ptrlist_add_sorted(db->pkgcache, info, _pacman_pkg_cmp); } return(0); @@ -114,7 +114,7 @@ int _pacman_db_add_pkgincache(Database *db, Package *pkg) pkg->acquire(); // FIXME: Should not be necessary, but required during migration to refcounted object _pacman_log(PM_LOG_DEBUG, _("adding entry '%s' in '%s' cache"), pkg->name(), db->treename); - db->pkgcache = _pacman_list_add_sorted(db->pkgcache, pkg, _pacman_pkg_cmp); + db->pkgcache = f_ptrlist_add_sorted(db->pkgcache, pkg, _pacman_pkg_cmp); _pacman_db_clear_grpcache(db); @@ -189,10 +189,10 @@ int _pacman_db_load_grpcache(Database *db) if(grp == NULL) { grp = new Group((char *)i->data); - db->grpcache = _pacman_list_add_sorted(db->grpcache, grp, _pacman_grp_cmp); + db->grpcache = f_ptrlist_add_sorted(db->grpcache, grp, _pacman_grp_cmp); } if(!_pacman_list_is_strin(pkg->name(), grp->packages)) { - grp->packages = _pacman_list_add_sorted(grp->packages, pkg->name(), strcmp); + grp->packages = f_ptrlist_add_sorted(grp->packages, pkg->name(), strcmp); } } } diff --git a/lib/libpacman/conflict.cpp b/lib/libpacman/conflict.cpp index d52c7ab..0fd8449 100644 --- a/lib/libpacman/conflict.cpp +++ b/lib/libpacman/conflict.cpp @@ -63,14 +63,14 @@ pmlist_t *_pacman_checkconflicts(pmtrans_t *trans, pmlist_t *packages) return(NULL); } - howmany = _pacman_list_count(packages); + howmany = f_ptrlist_count(packages); for(i = packages; i; i = i->next) { Package *tp = i->data; if(tp == NULL) { continue; } - remain = _pacman_list_count(i); + remain = f_ptrlist_count(i); percent = (double)(howmany - remain + 1) / howmany; if(trans->m_type == PM_TRANS_TYPE_SYNC) { @@ -249,12 +249,12 @@ pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans) if(db_local == NULL || targets == NULL || root == NULL) { return(NULL); } - howmany = _pacman_list_count(targets); + howmany = f_ptrlist_count(targets); /* CHECK 1: check every target against every target */ for(i = targets; i; i = i->next) { Package *p1 = (Package*)i->data; - remain = _pacman_list_count(i); + remain = f_ptrlist_count(i); percent = (double)(howmany - remain + 1) / howmany; PROGRESS(trans, PM_TRANS_PROGRESS_CONFLICTS_START, "", (percent * 100), howmany, howmany - remain + 1); for(j = i; j; j = j->next) { @@ -270,7 +270,7 @@ pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans) STRNCPY(conflict->target, p1->name(), PKG_NAME_LEN); STRNCPY(conflict->file, f_stringlistitem_to_str(k), CONFLICT_FILE_LEN); STRNCPY(conflict->ctarget, p2->name(), PKG_NAME_LEN); - conflicts = _pacman_list_add(conflicts, conflict); + conflicts = f_ptrlist_add(conflicts, conflict); } FREELIST(ret); } @@ -351,7 +351,7 @@ pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans) STRNCPY(conflict->target, p->name(), PKG_NAME_LEN); STRNCPY(conflict->file, filestr, CONFLICT_FILE_LEN); conflict->ctarget[0] = 0; - conflicts = _pacman_list_add(conflicts, conflict); + conflicts = f_ptrlist_add(conflicts, conflict); } } } diff --git a/lib/libpacman/db/fakedb.cpp b/lib/libpacman/db/fakedb.cpp index 33a7ca1..d24183f 100644 --- a/lib/libpacman/db/fakedb.cpp +++ b/lib/libpacman/db/fakedb.cpp @@ -87,7 +87,7 @@ int _pacman_fakedb_addtarget(pmtrans_t *trans, const char *name) if (dummy == NULL) return -1; /* add the package to the transaction */ - trans->packages = _pacman_list_add(trans->packages, dummy); + trans->packages = f_ptrlist_add(trans->packages, dummy); return(0); } diff --git a/lib/libpacman/db/localdb.cpp b/lib/libpacman/db/localdb.cpp index 2bcfc8b..9f7b62f 100644 --- a/lib/libpacman/db/localdb.cpp +++ b/lib/libpacman/db/localdb.cpp @@ -140,11 +140,11 @@ int _pacman_localpackage_remove(Package *pkg, pmtrans_t *trans, int howmany, int Handle *handle = trans->m_handle; char line[PATH_MAX+1]; - int filenum = _pacman_list_count(pkg->files()); + int filenum = f_ptrlist_count(pkg->files()); _pacman_log(PM_LOG_FLOW1, _("removing files")); /* iterate through the list backwards, unlinking files */ - for(lp = _pacman_list_last(pkg->files()); lp; lp = f_ptrlistitem_previous(lp)) { + for(lp = f_ptrlist_last(pkg->files()); lp; lp = f_ptrlistitem_previous(lp)) { int nb = 0; double percent = 0; const char *file = f_stringlistitem_to_str(lp); @@ -556,7 +556,7 @@ pmlist_t *LocalDatabase::getowners(const char *filename) snprintf(path, PATH_MAX, "%s%s", m_handle->root, (char *)i->data); if(!strcmp(path, rpath)) { - ret = _pacman_list_add(ret, info); + ret = f_ptrlist_add(ret, info); if(rpath[strlen(rpath)-1] != '/') { /* we are searching for a file and multiple packages won't contain * the same file */ diff --git a/lib/libpacman/deps.cpp b/lib/libpacman/deps.cpp index b3c29df..c75d1ff 100644 --- a/lib/libpacman/deps.cpp +++ b/lib/libpacman/deps.cpp @@ -92,7 +92,7 @@ int _pacman_depmiss_isin(pmdepmissing_t *needle, pmlist_t *haystack) pmlist_t *_pacman_depmisslist_add(pmlist_t *misslist, pmdepmissing_t *miss) { if(!_pacman_depmiss_isin(miss, misslist)) { - misslist = _pacman_list_add(misslist, miss); + misslist = f_ptrlist_add(misslist, miss); } else { delete miss; } @@ -133,7 +133,7 @@ pmlist_t *_pacman_sortbydeps(pmlist_t *targets, int mode) for(i = targets; i; i = i->next) { pmgraph_t *v = _pacman_graph_new(); v->data = (void *)i->data; - vertices = _pacman_list_add(vertices, v); + vertices = f_ptrlist_add(vertices, v); } /* We compute the edges */ @@ -151,7 +151,7 @@ pmlist_t *_pacman_sortbydeps(pmlist_t *targets, int mode) child = _pacman_depcmp(p_j, &depend); } if(child) { - vertex_i->children = _pacman_list_add(vertex_i->children, vertex_j); + vertex_i->children = f_ptrlist_add(vertex_i->children, vertex_j); } } vertex_i->childptr = vertex_i->children; @@ -175,7 +175,7 @@ pmlist_t *_pacman_sortbydeps(pmlist_t *targets, int mode) } } if(!found) { - newtargs = _pacman_list_add(newtargs, vertex->data); + newtargs = f_ptrlist_add(newtargs, vertex->data); /* mark that we've left this vertex */ vertex->state = 1; vertex = vertex->parent; @@ -539,7 +539,7 @@ pmlist_t *_pacman_removedeps(Database *db, pmlist_t *targs) /* add it to the target list */ _pacman_log(PM_LOG_DEBUG, _("loading ALL info for '%s'"), pkg->name()); pkg->read(INFRQ_ALL); - newtargs = _pacman_list_add(newtargs, pkg); + newtargs = f_ptrlist_add(newtargs, pkg); _pacman_log(PM_LOG_FLOW2, _("adding '%s' to the targets"), pkg->name()); newtargs = _pacman_removedeps(db, newtargs); } @@ -567,7 +567,7 @@ int _pacman_resolvedeps(pmtrans_t *trans, Package *syncpkg, pmlist_t *list, return(-1); } - targ = _pacman_list_add(NULL, syncpkg); + targ = f_ptrlist_add(NULL, syncpkg); deps = _pacman_checkdeps(trans, PM_TRANS_TYPE_ADD, targ); FREELISTPTR(targ); @@ -616,7 +616,7 @@ int _pacman_resolvedeps(pmtrans_t *trans, Package *syncpkg, pmlist_t *list, goto error; } *miss = *(pmdepmissing_t *)i->data; - *data = _pacman_list_add(*data, miss); + *data = f_ptrlist_add(*data, miss); } pm_errno = PM_ERR_UNSATISFIED_DEPS; goto error; @@ -639,13 +639,13 @@ int _pacman_resolvedeps(pmtrans_t *trans, Package *syncpkg, pmlist_t *list, dummypkg->release(); } if(usedep) { - trail = _pacman_list_add(trail, ps); + trail = f_ptrlist_add(trail, ps); if(_pacman_resolvedeps(trans, ps, list, trail, data)) { goto error; } _pacman_log(PM_LOG_DEBUG, _("pulling dependency %s (needed by %s)"), ps->name(), syncpkg->name()); - list = _pacman_list_add(list, ps); + list = f_ptrlist_add(list, ps); } else { _pacman_log(PM_LOG_ERROR, _("cannot resolve dependencies for \"%s\""), miss->target); if(data) { @@ -654,7 +654,7 @@ int _pacman_resolvedeps(pmtrans_t *trans, Package *syncpkg, pmlist_t *list, goto error; } *miss = *(pmdepmissing_t *)i->data; - *data = _pacman_list_add(*data, miss); + *data = f_ptrlist_add(*data, miss); } pm_errno = PM_ERR_UNSATISFIED_DEPS; goto error; @@ -765,12 +765,12 @@ int pacman_output_generate(pmlist_t *targets, pmlist_t *dblist) { } strcpy(fullDep, depend.name); if(!inList(found, fullDep) && !inList(targets, fullDep)) { - targets = _pacman_list_add(targets, fullDep); + targets = f_ptrlist_add(targets, fullDep); } } if(!inList(found,pname)) { printf("%s ", pname); - found = _pacman_list_add(found, pname); + found = f_ptrlist_add(found, pname); } FREE(match); } diff --git a/lib/libpacman/handle.cpp b/lib/libpacman/handle.cpp index 9da2b75..2a2add5 100644 --- a/lib/libpacman/handle.cpp +++ b/lib/libpacman/handle.cpp @@ -162,7 +162,7 @@ Database *Handle::createDatabase(const char *treename, pacman_cb_db_register cal if(strcmp(treename, "local") == 0) { db_local = db; } else { - dbs_sync = _pacman_list_add(dbs_sync, db); + dbs_sync = f_ptrlist_add(dbs_sync, db); } return(db); } diff --git a/lib/libpacman/package/fpmpackage.cpp b/lib/libpacman/package/fpmpackage.cpp index 167a3f8..c365a90 100644 --- a/lib/libpacman/package/fpmpackage.cpp +++ b/lib/libpacman/package/fpmpackage.cpp @@ -82,7 +82,7 @@ int _pacman_pkginfo_fread(FILE *descfile, Package *info, int output) STRNCPY(info->m_version, ptr, sizeof(info->m_version)); } else if(!strcmp(key, "PKGDESC")) { info->desc_localized = f_stringlist_append(info->desc_localized, ptr); - if(_pacman_list_count(info->desc_localized) == 1) { + if(f_ptrlist_count(info->desc_localized) == 1) { STRNCPY(info->m_description, ptr, sizeof(info->m_description)); } else if (!strncmp(ptr, handle->language, strlen(handle->language))) { STRNCPY(info->m_description, ptr+strlen(handle->language)+1, sizeof(info->m_description)); @@ -223,7 +223,7 @@ Package *_pacman_fpmpackage_load(const char *pkgfile) /* no .FILELIST present in this package.. build the filelist the */ /* old-fashioned way, one at a time */ expath = strdup(archive_entry_pathname (entry)); - info->m_files = _pacman_list_add(info->m_files, expath); + info->m_files = f_ptrlist_add(info->m_files, expath); } } diff --git a/lib/libpacman/pacman.cpp b/lib/libpacman/pacman.cpp index dd6cd2b..839f41c 100644 --- a/lib/libpacman/pacman.cpp +++ b/lib/libpacman/pacman.cpp @@ -527,7 +527,7 @@ int pacman_db_setserver(pmdb_t *_db, char *url) /* pm_errno is set by _pacman_server_new */ return(-1); } - db->servers = _pacman_list_add(db->servers, server); + db->servers = f_ptrlist_add(db->servers, server); _pacman_log(PM_LOG_FLOW2, _("adding new server to database '%s': protocol '%s', server '%s', path '%s'"), db->treename, server->protocol, server->server, server->path); } else { @@ -1337,7 +1337,7 @@ int pacman_list_count(pmlist_t *list) { ASSERT(list != NULL, return(-1)); - return(_pacman_list_count(list)); + return(f_ptrlist_count(list)); } /** Free a list iterator. diff --git a/lib/libpacman/server.cpp b/lib/libpacman/server.cpp index 24adfa6..291da7b 100644 --- a/lib/libpacman/server.cpp +++ b/lib/libpacman/server.cpp @@ -380,7 +380,7 @@ int _pacman_downloadfiles_forreal(Handle *handle, pmlist_t *servers, const char } if(howmany) { - *howmany = _pacman_list_count(files); + *howmany = f_ptrlist_count(files); } if(remain) { *remain = 1; @@ -494,7 +494,7 @@ int _pacman_downloadfiles_forreal(Handle *handle, pmlist_t *servers, const char _pacman_log(PM_LOG_DEBUG, _("XferCommand command returned non-zero status code (%d)\n"), ret); } else { /* download was successful */ - complete = _pacman_list_add(complete, fn); + complete = f_ptrlist_add(complete, fn); if(usepart) { char fnpart[PATH_MAX]; /* rename "output.part" file to "output" file */ @@ -561,7 +561,7 @@ int _pacman_downloadfiles_forreal(Handle *handle, pmlist_t *servers, const char if(!strcmp(server->protocol, "file")) { EVENT(handle->trans, PM_TRANS_EVT_RETRIEVE_LOCAL, pm_dlfnm, server->path); } - complete = _pacman_list_add(complete, fn); + complete = f_ptrlist_add(complete, fn); /* rename "output.part" file to "output" file */ snprintf(completefile, PATH_MAX, "%s/%s", localpath, fn); rename(output, completefile); @@ -581,7 +581,7 @@ int _pacman_downloadfiles_forreal(Handle *handle, pmlist_t *servers, const char } } - if(_pacman_list_count(complete) == _pacman_list_count(files)) { + if(f_ptrlist_count(complete) == f_ptrlist_count(files)) { done = 1; } } @@ -637,9 +637,9 @@ char *_pacman_fetch_pkgurl(Handle *handle, char *target) server->protocol = url; server->server = host; server->path = spath; - servers = _pacman_list_add(servers, server); + servers = f_ptrlist_add(servers, server); - files = _pacman_list_add(NULL, fn); + files = f_ptrlist_add(NULL, fn); if(_pacman_downloadfiles(handle, servers, lcache, files, 0)) { _pacman_log(PM_LOG_WARNING, _("failed to download %s\n"), target); return(NULL); diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index 6655aed..5131469 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -274,7 +274,7 @@ pmsyncpkg_t *__pmtrans_t::add(pmsyncpkg_t *syncpkg, int flags) return NULL; } _pacman_log(PM_LOG_FLOW2, _("adding target '%s' to the transaction set"), syncpkg->pkg_name); - syncpkgs = _pacman_list_add(syncpkgs, syncpkg); + syncpkgs = f_ptrlist_add(syncpkgs, syncpkg); return syncpkg; } @@ -283,7 +283,7 @@ int __pmtrans_t::add(Package *pkg, pmtranstype_t type, int flags) ASSERT(pkg != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); _pacman_log(PM_LOG_FLOW2, _("adding %s in the targets list"), pkg->name()); - packages = _pacman_list_add(packages, pkg); + packages = f_ptrlist_add(packages, pkg); return 0; } @@ -512,8 +512,8 @@ int __pmtrans_t::prepare(pmlist_t **data) } /* If there's nothing to do, return without complaining */ - if(_pacman_list_empty(packages) && - _pacman_list_empty(syncpkgs)) { + if(f_ptrlist_empty(packages) && + f_ptrlist_empty(syncpkgs)) { return(0); } @@ -522,7 +522,7 @@ int __pmtrans_t::prepare(pmlist_t **data) if(m_type == PM_TRANS_TYPE_SYNC) { for(i = syncpkgs; i; i = i->next) { pmsyncpkg_t *ps = i->data; - list = _pacman_list_add(list, ps->pkg_new); + list = f_ptrlist_add(list, ps->pkg_new); } if(!(flags & PM_TRANS_FLAG_NODEPS)) { @@ -549,7 +549,7 @@ int __pmtrans_t::prepare(pmlist_t **data) ret = -1; goto cleanup; } - syncpkgs = _pacman_list_add(syncpkgs, ps); + syncpkgs = f_ptrlist_add(syncpkgs, ps); _pacman_log(PM_LOG_FLOW2, _("adding package %s-%s to the transaction targets"), spkg->name(), spkg->version()); } else { @@ -565,14 +565,14 @@ int __pmtrans_t::prepare(pmlist_t **data) k = l = NULL; for(i=syncpkgs; i; i=i->next) { pmsyncpkg_t *s = (pmsyncpkg_t*)i->data; - k = _pacman_list_add(k, s->pkg_new); + k = f_ptrlist_add(k, s->pkg_new); } m = _pacman_sortbydeps(k, PM_TRANS_TYPE_ADD); for(i=m; i; i=i->next) { for(j=syncpkgs; j; j=j->next) { pmsyncpkg_t *s = (pmsyncpkg_t*)j->data; if(s->pkg_new == i->data) { - l = _pacman_list_add(l, s); + l = f_ptrlist_add(l, s); } } } @@ -719,7 +719,7 @@ int __pmtrans_t::prepare(pmlist_t **data) } /* append to the replaces list */ _pacman_log(PM_LOG_FLOW2, _("electing '%s' for removal"), miss->depend.name); - ps->data = _pacman_list_add(ps->data, q); + ps->data = f_ptrlist_add(ps->data, q); if(rsync) { /* remove it from the target list */ pmsyncpkg_t *spkg = NULL; @@ -739,7 +739,7 @@ int __pmtrans_t::prepare(pmlist_t **data) goto cleanup; } *miss = *(pmdepmissing_t *)i->data; - *data = _pacman_list_add(*data, miss); + *data = f_ptrlist_add(*data, miss); } } } @@ -753,7 +753,7 @@ int __pmtrans_t::prepare(pmlist_t **data) goto cleanup; } *miss = *(pmdepmissing_t *)i->data; - *data = _pacman_list_add(*data, miss); + *data = f_ptrlist_add(*data, miss); } } } @@ -789,7 +789,7 @@ int __pmtrans_t::prepare(pmlist_t **data) pmsyncpkg_t *ps = i->data; if(ps->type == PM_SYNC_TYPE_REPLACE) { for(j = ps->data; j; j = j->next) { - list = _pacman_list_add(list, j->data); + list = f_ptrlist_add(list, j->data); } } } @@ -846,7 +846,7 @@ int __pmtrans_t::prepare(pmlist_t **data) goto cleanup; } *miss = *(pmdepmissing_t *)i->data; - *data = _pacman_list_add(*data, miss); + *data = f_ptrlist_add(*data, miss); } } } @@ -903,7 +903,7 @@ cleanup: Package *pkg_local = db_local->scan(miss->depend.name, INFRQ_ALL); if(pkg_local) { _pacman_log(PM_LOG_FLOW2, _("pulling %s in the targets list"), pkg_local->name()); - packages = _pacman_list_add(packages, pkg_local); + packages = f_ptrlist_add(packages, pkg_local); } else { _pacman_log(PM_LOG_ERROR, _("could not find %s in database -- skipping"), miss->depend.name); @@ -1330,7 +1330,7 @@ int _pacman_cachedpkg_check_integrity(Package *spkg, __pmtrans_t *trans, pmlist_ RET_ERR(PM_ERR_MEMORY, -1); } snprintf(ptr, 512, _("can't get md5 or sha1 checksum for package %s\n"), pkgname); - *data = _pacman_list_add(*data, ptr); + *data = f_ptrlist_add(*data, ptr); retval = 1; goto out; } @@ -1342,7 +1342,7 @@ int _pacman_cachedpkg_check_integrity(Package *spkg, __pmtrans_t *trans, pmlist_ RET_ERR(PM_ERR_MEMORY, -1); } snprintf(ptr, 512, _("can't get md5 or sha1 checksum for package %s\n"), pkgname); - *data = _pacman_list_add(*data, ptr); + *data = f_ptrlist_add(*data, ptr); retval = 1; goto out; } @@ -1369,7 +1369,7 @@ int _pacman_cachedpkg_check_integrity(Package *spkg, __pmtrans_t *trans, pmlist_ } else { snprintf(ptr, 512, _("archive %s is corrupted (bad MD5 or SHA1 checksum)\n"), pkgname); } - *data = _pacman_list_add(*data, ptr); + *data = f_ptrlist_add(*data, ptr); retval = 1; } @@ -1426,8 +1426,8 @@ int __pmtrans_t::commit(pmlist_t **data) *data = NULL; /* If there's nothing to do, return without complaining */ - if(_pacman_list_empty(packages) && - _pacman_list_empty(syncpkgs)) { + if(f_ptrlist_empty(packages) && + f_ptrlist_empty(syncpkgs)) { return(0); } @@ -1603,9 +1603,9 @@ int __pmtrans_t::commit(pmlist_t **data) if(tr->add(str, tr->m_type, tr->flags) == -1) { goto error; } - /* using _pacman_list_last() is ok because addtarget() adds the new target at the + /* using f_ptrlist_last() is ok because addtarget() adds the new target at the * end of the tr->packages list */ - spkg = _pacman_list_last(tr->packages)->data; + spkg = f_ptrlist_last(tr->packages)->data; if(ps->type == PM_SYNC_TYPE_DEPEND || flags & PM_TRANS_FLAG_ALLDEPS) { spkg->m_reason = PM_PKG_REASON_DEPEND; } else if(ps->type == PM_SYNC_TYPE_UPGRADE && !m_handle->sysupgrade) { @@ -1687,14 +1687,14 @@ int __pmtrans_t::commit(pmlist_t **data) int ret = 0; time_t t; - howmany = _pacman_list_count(packages); + howmany = f_ptrlist_count(packages); for(targ = packages; targ; targ = targ->next) { Package *pkg_new = NULL, *pkg_local = NULL; void *event_arg0 = NULL, *event_arg1 = NULL; pmtranstype_t type = m_type; - remain = _pacman_list_count(targ); + remain = f_ptrlist_count(targ); if(m_handle->trans->state == STATE_INTERRUPTED) { break; diff --git a/lib/libpacman/trans_sysupgrade.cpp b/lib/libpacman/trans_sysupgrade.cpp index c9abd99..9ff3429 100644 --- a/lib/libpacman/trans_sysupgrade.cpp +++ b/lib/libpacman/trans_sysupgrade.cpp @@ -113,7 +113,7 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) if(ps) { /* found it -- just append to the replaces list */ lpkg->acquire(); - ps->data = _pacman_list_add(ps->data, lpkg); + ps->data = f_ptrlist_add(ps->data, lpkg); } else { /* none found -- enter pkg into the final sync list */ ps = new __pmsyncpkg_t(PM_SYNC_TYPE_REPLACE, spkg, NULL); @@ -122,8 +122,8 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) goto error; } lpkg->acquire(); - ps->data = _pacman_list_add(NULL, lpkg); - trans->syncpkgs = _pacman_list_add(trans->syncpkgs, ps); + ps->data = f_ptrlist_add(NULL, lpkg); + trans->syncpkgs = f_ptrlist_add(trans->syncpkgs, ps); } _pacman_log(PM_LOG_FLOW2, _("%s-%s elected for upgrade (to be replaced by %s-%s)"), lpkg->name(), lpkg->version(), spkg->name(), spkg->version()); @@ -196,7 +196,7 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) if(ps == NULL) { goto error; } - trans->syncpkgs = _pacman_list_add(trans->syncpkgs, ps); + trans->syncpkgs = f_ptrlist_add(trans->syncpkgs, ps); } else { /* spkg->name is already in the packages list -- just ignore it */ } diff --git a/lib/libpacman/util.cpp b/lib/libpacman/util.cpp index 70bf0b2..6541a92 100644 --- a/lib/libpacman/util.cpp +++ b/lib/libpacman/util.cpp @@ -166,7 +166,7 @@ int _pacman_unpack(const char *archive, const char *prefix, const char *fn) return(-1); memset(c, 0, sizeof(cache_t)); c->str = strdup(ent->d_name); - cache = _pacman_list_add(cache, c); + cache = f_ptrlist_add(cache, c); } } closedir(handle); @@ -509,13 +509,13 @@ int _pacman_check_freespace(pmtrans_t *trans, pmlist_t **data) return(-1); } *ptr = pkgsize; - *data = _pacman_list_add(*data, ptr); + *data = f_ptrlist_add(*data, ptr); if((ptr = (long long*)malloc(sizeof(long long)))==NULL) { FREELIST(*data); return(-1); } *ptr = freespace; - *data = _pacman_list_add(*data, ptr); + *data = f_ptrlist_add(*data, ptr); } pm_errno = PM_ERR_DISK_FULL; return(-1); diff --git a/lib/libpacman/util/fptrlist.c b/lib/libpacman/util/fptrlist.c index 70ff003..a090575 100644 --- a/lib/libpacman/util/fptrlist.c +++ b/lib/libpacman/util/fptrlist.c @@ -33,7 +33,7 @@ /* Add items to a list in sorted order. Use the given comparison function to * determine order. */ -FPtrList *_pacman_list_add_sorted(FPtrList *list, void *data, _pacman_fn_cmp fn) +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); @@ -124,7 +124,7 @@ FPtrList *_pacman_list_reverse(FPtrList *list) FPtrListItem *it; for(it = f_ptrlist_last(list); it; it = f_ptrlistitem_previous(it)) { - newlist = _pacman_list_add(newlist, it->data); + newlist = f_ptrlist_add(newlist, it->data); } return(newlist); diff --git a/lib/libpacman/util/fptrlist.h b/lib/libpacman/util/fptrlist.h index 7ef6d6d..52d6e34 100644 --- a/lib/libpacman/util/fptrlist.h +++ b/lib/libpacman/util/fptrlist.h @@ -59,12 +59,7 @@ typedef int (*_pacman_fn_cmp)(const void *, const void *); #define _pacman_list_new f_ptrlist_new -#define _pacman_list_add f_ptrlist_append -#define _pacman_list_count f_ptrlist_count -#define _pacman_list_empty f_ptrlist_empty -#define _pacman_list_last f_ptrlist_last - -FPtrList *_pacman_list_add_sorted(FPtrList *list, void *data, _pacman_fn_cmp fn); +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
