Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=d534de79af14ff4f093a745a49e3d09fefd5eea3
commit d534de79af14ff4f093a745a49e3d09fefd5eea3 Author: Michel Hermier <[email protected]> Date: Wed May 7 09:23:53 2014 +0200 libpacman: s/_pacman_trans_find/__pmtrans_t::find/. diff --git a/lib/libpacman/sync.cpp b/lib/libpacman/sync.cpp index a0d4084..0ee4f1a 100644 --- a/lib/libpacman/sync.cpp +++ b/lib/libpacman/sync.cpp @@ -179,7 +179,7 @@ int _pacman_sync_addtarget(pmtrans_t *trans, const char *name) } /* add the package to the transaction */ - if(!_pacman_trans_find(trans, spkg->name())) { + if(!trans->find(spkg->name())) { Package *dummy = NULL; pmsyncpkg_t *ps; @@ -267,7 +267,7 @@ int _pacman_sync_prepare(pmtrans_t *trans, pmlist_t **data) for(i = list; i; i = i->next) { /* add the dependencies found by resolvedeps to the transaction set */ Package *spkg = i->data; - if(!_pacman_trans_find(trans, spkg->name())) { + if(!trans->find(spkg->name())) { pmsyncpkg_t *ps = new __pmsyncpkg_t(PM_SYNC_TYPE_DEPEND, spkg, NULL); if(ps == NULL) { ret = -1; @@ -356,7 +356,7 @@ int _pacman_sync_prepare(pmtrans_t *trans, pmlist_t **data) continue; } - ps = _pacman_trans_find(trans, miss->target); + ps = trans->find(miss->target); if(ps == NULL) { _pacman_log(PM_LOG_DEBUG, _("'%s' not found in transaction set -- skipping"), miss->target); @@ -407,7 +407,7 @@ int _pacman_sync_prepare(pmtrans_t *trans, pmlist_t **data) rmpkg = miss->depend.name; } if(rmpkg) { - pmsyncpkg_t *rsync = _pacman_trans_find(trans, rmpkg); + pmsyncpkg_t *rsync = trans->find(rmpkg); pmsyncpkg_t *spkg = NULL; _pacman_log(PM_LOG_FLOW2, _("removing '%s' from target list"), rmpkg); @@ -426,7 +426,7 @@ int _pacman_sync_prepare(pmtrans_t *trans, pmlist_t **data) QUESTION(trans, PM_TRANS_CONV_CONFLICT_PKG, miss->target, miss->depend.name, NULL, &doremove); asked = _pacman_stringlist_append(asked, miss->depend.name); if(doremove) { - pmsyncpkg_t *rsync = _pacman_trans_find(trans, miss->depend.name); + pmsyncpkg_t *rsync = trans->find(miss->depend.name); Package *q = new Package(miss->depend.name, NULL); if(q == NULL) { if(data) { @@ -525,7 +525,7 @@ int _pacman_sync_prepare(pmtrans_t *trans, pmlist_t **data) int errorout = 0; for(i = deps; i; i = i->next) { pmdepmissing_t *miss = i->data; - if(!_pacman_trans_find(trans, miss->depend.name)) { + if(!trans->find(miss->depend.name)) { int pfound = 0; /* If miss->depend.name depends on something that miss->target and a * package in final both provide, then it's okay... */ diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index fc127ec..75c6cd6 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -206,13 +206,11 @@ int _pacman_trans_event(pmtrans_t *trans, unsigned char event, void *data1, void /* Test for existence of a package in a pmlist_t* of pmsyncpkg_t* * If found, return a pointer to the respective pmsyncpkg_t* */ -pmsyncpkg_t *_pacman_trans_find(const pmtrans_t *trans, const char *pkgname) +pmsyncpkg_t *__pmtrans_t::find(const char *pkgname) const { pmlist_t *i; - ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, NULL)); - - for(i = trans->syncpkgs; i != NULL ; i = i->next) { + for(i = syncpkgs; i != NULL ; i = i->next) { pmsyncpkg_t *ps = i->data; if(ps && !strcmp(ps->pkg->name(), pkgname)) { @@ -259,7 +257,7 @@ pmsyncpkg_t *_pacman_trans_add(pmtrans_t *trans, pmsyncpkg_t *syncpkg, int flags syncpkg->pkg_local = _pacman_db_get_pkgfromcache(db_local, syncpkg->pkg->name()); } - if((syncpkg_queued = _pacman_trans_find(trans, syncpkg->pkg_name)) != NULL) { + if((syncpkg_queued = trans->find(syncpkg->pkg_name)) != NULL) { /* FIXME: Try to compress syncpkg in syncpkg_queued more */ return NULL; } diff --git a/lib/libpacman/trans.h b/lib/libpacman/trans.h index 460b2d0..d3a6aaf 100644 --- a/lib/libpacman/trans.h +++ b/lib/libpacman/trans.h @@ -65,6 +65,8 @@ struct __pmtrans_t __pmtrans_t(pmtranstype_t type, unsigned int flags, pmtrans_cbs_t cbs); ~__pmtrans_t(); + pmsyncpkg_t *find(const char *pkgname) const; + const pmtrans_ops_t *ops; int (*set_state)(pmtrans_t *trans, int new_state); libpacman::Handle *handle; @@ -97,7 +99,6 @@ do { \ } while(0) int _pacman_trans_event(pmtrans_t *trans, unsigned char, void *, void *); -pmsyncpkg_t *_pacman_trans_find(const pmtrans_t *trans, const char *pkgname); pmsyncpkg_t *_pacman_trans_add(pmtrans_t *trans, pmsyncpkg_t *syncpkg, int flags); int _pacman_trans_add_package(pmtrans_t *trans, pmpkg_t *pkg, pmtranstype_t type, int flags); diff --git a/lib/libpacman/trans_sysupgrade.cpp b/lib/libpacman/trans_sysupgrade.cpp index b4d1981..77c0c8f 100644 --- a/lib/libpacman/trans_sysupgrade.cpp +++ b/lib/libpacman/trans_sysupgrade.cpp @@ -114,7 +114,7 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) } dummy->m_requiredby = _pacman_list_strdup(lpkg->requiredby()); /* check if spkg->name is already in the packages list. */ - ps = _pacman_trans_find(trans, spkg->name()); + ps = trans->find(spkg->name()); if(ps) { /* found it -- just append to the replaces list */ ps->data = _pacman_list_add(ps->data, dummy); @@ -195,7 +195,7 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) _pacman_log(PM_LOG_FLOW2, _("%s-%s elected for upgrade (%s => %s)"), local->name(), local->version(), local->version(), spkg->version()); /* check if spkg->name is already in the packages list. */ - if(!_pacman_trans_find(trans, spkg->name())) { + if(!trans->find(spkg->name())) { Package *dummy = new Package(local->name(), local->version()); if(dummy == NULL) { goto error; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
