Author: schubi2 Date: Mon Feb 4 14:41:07 2008 New Revision: 8454 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8454&view=rev Log: added pool to arguments Modified: trunk/sat-solver/src/policy.c trunk/sat-solver/src/solver.h Modified: trunk/sat-solver/src/policy.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/policy.c?rev=8454&r1=8453&r2=8454&view=diff ============================================================================== --- trunk/sat-solver/src/policy.c (original) +++ trunk/sat-solver/src/policy.c Mon Feb 4 14:41:07 2008 @@ -300,7 +300,7 @@ { if (solv && solv->bestSolvableCb) { /* The application is responsible for */ - return solv->bestSolvableCb (plist); + return solv->bestSolvableCb (solv->pool, plist); } if (plist->count > 1) @@ -334,7 +334,7 @@ if (solv && solv->archCheckCb) { /* The application is responsible for */ - return solv->archCheckCb (s1, s2); + return solv->archCheckCb (solv->pool, s1, s2); } /* we allow changes to/from noarch */ @@ -357,7 +357,7 @@ if (solv && solv->vendorCheckCb) { /* The application is responsible for */ - return solv->vendorCheckCb (s1, s2); + return solv->vendorCheckCb (solv->pool, s1, s2); } if (s1->vendor == s2->vendor) @@ -385,7 +385,7 @@ if (solv && solv->updateCandidateCb) { /* The application is responsible for */ - return solv->updateCandidateCb (s, qs); + return solv->updateCandidateCb (solv->pool, s, qs); } /* Modified: trunk/sat-solver/src/solver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.h?rev=8454&r1=8453&r2=8454&view=diff ============================================================================== --- trunk/sat-solver/src/solver.h (original) +++ trunk/sat-solver/src/solver.h Mon Feb 4 14:41:07 2008 @@ -22,10 +22,10 @@ * Callback definitions in order to "overwrite" the policies by an external application. */ -typedef void (*BestSolvableCb) (Queue *canditates); -typedef int (*ArchCheckCb) (Solvable *solvable1, Solvable *solvable2); -typedef int (*VendorCheckCb) (Solvable *solvable1, Solvable *solvable2); -typedef void (*UpdateCandidateCb) (Solvable *solvable, Queue *canditates); +typedef void (*BestSolvableCb) (Pool *pool, Queue *canditates); +typedef int (*ArchCheckCb) (Pool *pool, Solvable *solvable1, Solvable *solvable2); +typedef int (*VendorCheckCb) (Pool *pool, Solvable *solvable1, Solvable *solvable2); +typedef void (*UpdateCandidateCb) (Pool *pool, Solvable *solvable, Queue *canditates); /* ---------------------------------------------- @@ -127,7 +127,7 @@ /* Finding best candidate * * Callback definition: - * void bestSolvable (Queue *canditates) + * void bestSolvable (Pool *pool, Queue *canditates) * candidates : List of canditates which has to be sorted by the function call * return candidates: Sorted list of the candidates(first is the best). */ @@ -136,7 +136,7 @@ /* Checking if two solvables has compatible architectures * * Callback definition: - * int archCheck (Solvable *solvable1, Solvable *solvable2); + * int archCheck (Pool *pool, Solvable *solvable1, Solvable *solvable2); * * return 0 it the two solvables has compatible architectures */ @@ -145,7 +145,7 @@ /* Checking if two solvables has compatible vendors * * Callback definition: - * int vendorCheck (Solvable *solvable1, Solvable *solvable2); + * int vendorCheck (Pool *pool, Solvable *solvable1, Solvable *solvable2); * * return 0 it the two solvables has compatible architectures */ @@ -154,7 +154,7 @@ /* Evaluate update candidate * * Callback definition: - * void pdateCandidateCb (Solvable *solvable, Queue *canditates) + * void pdateCandidateCb (Pool *pool, Solvable *solvable, Queue *canditates) * solvable : for which updates should be search * candidates : List of candidates (This list depends on other * restrictions like architecture and vendor policies too) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org