ref: refs/heads/master commit bb39cf887ab57e8ca9f2ed906589e2fe57295f47 Author: Michael Schroeder Date: Mon Jun 15 20:51:29 2009 +0200 - move output arg to back in solver_calculate_noobsmap() --- src/pool.h | 7 ++++--- src/solver.c | 4 ++-- src/solver.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/pool.h b/src/pool.h index be0ef66..e9959ee 100644 --- a/src/pool.h +++ b/src/pool.h @@ -320,9 +320,10 @@ const char *pool_lookup_checksum(Pool *pool, Id entry, Id keyname, Id *typep); for (vp = pool_whatprovides(pool, d) ; (v = pool->whatprovidesdata[vp++]) != 0; ) /* loop over all repositories */ -#define FOR_REPOS(rid, r) \ - for (rid = 0; rid < pool->nrepos; rid++) \ - if ((r = pool->repos[rid]) != 0) +/* note that idx is not the repoid */ +#define FOR_REPOS(idx, r) \ + for (idx = 0; idx < pool->nrepos; idx++) \ + if ((r = pool->repos[idx]) != 0) #define POOL_DEBUG(type, ...) do {if ((pool->debugmask & (type)) != 0) pool_debug(pool, (type), __VA_ARGS__);} while (0) diff --git a/src/solver.c b/src/solver.c index fccee4a..132f7f4 100644 --- a/src/solver.c +++ b/src/solver.c @@ -2344,7 +2344,7 @@ findrecommendedsuggested(Solver *solv) } void -solver_calculate_noobsmap(Pool *pool, Map *noobsmap, Queue *job) +solver_calculate_noobsmap(Pool *pool, Queue *job, Map *noobsmap) { int i; Id how, what, select; @@ -2413,7 +2413,7 @@ solver_solve(Solver *solv, Queue *job) */ /* create noobsolete map if needed */ - solver_calculate_noobsmap(pool, &solv->noobsoletes, job); + solver_calculate_noobsmap(pool, job, &solv->noobsoletes); map_init(&addedmap, pool->nsolvables); MAPSET(&addedmap, SYSTEMSOLVABLE); diff --git a/src/solver.h b/src/solver.h index 3166602..3f6574f 100644 --- a/src/solver.h +++ b/src/solver.h @@ -269,7 +269,7 @@ extern void solver_reset(Solver *solv); extern int solver_dep_installed(Solver *solv, Id dep); extern int solver_splitprovides(Solver *solv, Id dep); -extern void solver_calculate_noobsmap(Pool *pool, Map *noobsmap, Queue *job); +extern void solver_calculate_noobsmap(Pool *pool, Queue *job, Map *noobsmap); /* obsolete */ extern SolverRuleinfo solver_problemruleinfo(Solver *solv, Queue *job, Id rid, Id *depp, Id *sourcep, Id *targetp); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org