Author: mlschroe Date: Thu Nov 20 18:23:56 2008 New Revision: 11752 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11752&view=rev Log: - get rid of unused pool argument in solvable_identical Modified: trunk/sat-solver/src/pool.h trunk/sat-solver/src/solvable.c trunk/sat-solver/src/solver.c Modified: trunk/sat-solver/src/pool.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.h?rev=11752&r1=11751&r2=11752&view=diff ============================================================================== --- trunk/sat-solver/src/pool.h (original) +++ trunk/sat-solver/src/pool.h Thu Nov 20 18:23:56 2008 @@ -193,7 +193,7 @@ char * solvable_get_location(Solvable *s, unsigned int *medianrp); const unsigned char *solvable_lookup_bin_checksum(Solvable *s, Id keyname, Id *typep); const char *solvable_lookup_checksum(Solvable *s, Id keyname, Id *typep); -int solvable_identical(Pool *pool, Solvable *s1, Solvable *s2); +int solvable_identical(Solvable *s1, Solvable *s2); int solvable_trivial_installable_map(Solvable *s, Map *installedmap, Map *conflictsmap); int solvable_trivial_installable_repo(Solvable *s, struct _Repo *installed); Modified: trunk/sat-solver/src/solvable.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solvable.c?rev=11752&r1=11751&r2=11752&view=diff ============================================================================== --- trunk/sat-solver/src/solvable.c (original) +++ trunk/sat-solver/src/solvable.c Thu Nov 20 18:23:56 2008 @@ -469,8 +469,11 @@ } } +/* Tests if two solvables have identical content. Currently + * both solvables need to come from the same pool */ + int -solvable_identical(Pool *pool, Solvable *s1, Solvable *s2) +solvable_identical(Solvable *s1, Solvable *s2) { unsigned int bt1, bt2; Id rq1, rq2; Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=11752&r1=11751&r2=11752&view=diff ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Thu Nov 20 18:23:56 2008 @@ -1484,7 +1484,7 @@ for (i = 0; i < qs->count; i++) { Solvable *ns = pool->solvables + qs->elements[i]; - if (s->evr == ns->evr && solvable_identical(pool, s, ns)) + if (s->evr == ns->evr && solvable_identical(s, ns)) return s - pool->solvables; } /* nope, it must be some other package */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org