Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=42f382a924b3fdcb20beeb36d146fdd31c1eb5b6
commit 42f382a924b3fdcb20beeb36d146fdd31c1eb5b6 Author: Michel Hermier <[email protected]> Date: Mon May 12 17:30:26 2014 +0200 libpacman: Reusue some variables in __pmtrans_t::add. diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index d3ccef3..a51c22f 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -695,8 +695,6 @@ int __pmtrans_t::add(const char *target) if(type == PM_TRANS_TYPE_SYNC) { char targline[PKG_FULLNAME_LEN]; char *targ; - pmlist_t *j; - Package *pkg_local; Package *spkg = NULL; int cmp; @@ -705,8 +703,8 @@ int __pmtrans_t::add(const char *target) if(targ) { *targ = '\0'; targ++; - for(j = dbs_sync; j && !spkg; j = j->next) { - Database *dbs = j->data; + for(i = dbs_sync; i && !spkg; i = i->next) { + Database *dbs = i->data; if(strcmp(dbs->treename, targline) == 0) { spkg = _pacman_db_get_pkgfromcache(dbs, targ); if(spkg == NULL) { @@ -725,15 +723,15 @@ int __pmtrans_t::add(const char *target) } } else { targ = targline; - for(j = dbs_sync; j && !spkg; j = j->next) { - Database *dbs = j->data; + for(i = dbs_sync; i && !spkg; i = i->next) { + Database *dbs = i->data; spkg = _pacman_db_get_pkgfromcache(dbs, targ); } if(spkg == NULL) { /* Search provides */ _pacman_log(PM_LOG_FLOW2, _("target '%s' not found -- looking for provisions"), targ); - for(j = dbs_sync; j && !spkg; j = j->next) { - Database *dbs = j->data; + for(i = dbs_sync; i && !spkg; i = i->next) { + Database *dbs = i->data; pmlist_t *p = _pacman_db_whatprovides(dbs, targ); if(p) { _pacman_log(PM_LOG_DEBUG, _("found '%s' as a provision for '%s'"), p->data, targ); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
