Author: mlschroe Date: Mon Jan 14 11:08:11 2008 New Revision: 8266 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8266&view=rev Log: - add evrcmp_str for ma Modified: trunk/sat-solver/src/evr.c trunk/sat-solver/src/evr.h Modified: trunk/sat-solver/src/evr.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/evr.c?rev=8266&r1=8265&r2=8266&view=diff ============================================================================== --- trunk/sat-solver/src/evr.c (original) +++ trunk/sat-solver/src/evr.c Mon Jan 14 11:08:11 2008 @@ -73,23 +73,16 @@ return s1 < q1 ? 1 : s2 < q2 ? -1 : 0; } -#define EVRCMP_COMPARE 0 -#define EVRCMP_MATCH_RELEASE 1 -#define EVRCMP_MATCH 2 - -// edition (e:v-r) compare +/* edition (e:v-r) compare */ int -evrcmp(Pool *pool, Id evr1id, Id evr2id, int mode) +evrcmp_str(Pool *pool, const char *evr1, const char *evr2, int mode) { int r; - const char *evr1, *evr2; const char *s1, *s2; const char *r1, *r2; - if (evr1id == evr2id) + if (evr1 == evr2) return 0; - evr1 = id2str(pool, evr1id); - evr2 = id2str(pool, evr2id); #if 0 POOL_DEBUG(DEBUG_EVRCMP, "evrcmp %s %s mode=%d\n", evr1, evr2, mode); @@ -168,6 +161,17 @@ } int +evrcmp(Pool *pool, Id evr1id, Id evr2id, int mode) +{ + const char *evr1, *evr2; + if (evr1id == evr2id) + return 0; + evr1 = id2str(pool, evr1id); + evr2 = id2str(pool, evr2id); + return evrcmp_str(pool, evr1, evr2, mode); +} + +int evrmatch(Pool *pool, Id evrid, const char *epoch, const char *version, const char *release) { const char *evr1; Modified: trunk/sat-solver/src/evr.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/evr.h?rev=8266&r1=8265&r2=8266&view=diff ============================================================================== --- trunk/sat-solver/src/evr.h (original) +++ trunk/sat-solver/src/evr.h Mon Jan 14 11:08:11 2008 @@ -24,6 +24,7 @@ #define EVRCMP_MATCH 2 extern int vercmp(const char *s1, const char *q1, const char *s2, const char *q2); +extern int evrcmp_str(Pool *pool, const char *evr1, const char *evr2, int mode); extern int evrcmp(Pool *pool, Id evr1id, Id evr2id, int mode); extern int evrmatch(Pool *pool, Id evrid, const char *epoch, const char *version, const char *release); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org