Author: mlschroe Date: Wed Mar 5 16:15:58 2008 New Revision: 9021 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9021&view=rev Log: - add HEADEREND - reindent Modified: trunk/sat-solver/src/policy.c trunk/sat-solver/src/pool.c trunk/sat-solver/src/pool.h trunk/sat-solver/src/util.h Modified: trunk/sat-solver/src/policy.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/policy.c?rev=9021&r1=9020&r2=9021&view=diff ============================================================================== --- trunk/sat-solver/src/policy.c (original) +++ trunk/sat-solver/src/policy.c Wed Mar 5 16:15:58 2008 @@ -59,16 +59,15 @@ return 1; } return strcmp(na, nb); - } else { - /* the same name */ - if ( pool->solvables[a].evr == pool->solvables[b].evr) - { - /* prefer installed solvables first */ - if (solv->installed && pool->solvables[a].repo == solv->installed) - return -1; - if (solv->installed && pool->solvables[b].repo == solv->installed) - return 1; - } + } + /* the same name */ + if (pool->solvables[a].evr == pool->solvables[b].evr && solv->installed) + { + /* prefer installed solvables */ + if (pool->solvables[a].repo == solv->installed) + return -1; + if (pool->solvables[b].repo == solv->installed) + return 1; } return a - b; } Modified: trunk/sat-solver/src/pool.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.c?rev=9021&r1=9020&r2=9021&view=diff ============================================================================== --- trunk/sat-solver/src/pool.c (original) +++ trunk/sat-solver/src/pool.c Wed Mar 5 16:15:58 2008 @@ -108,6 +108,7 @@ "solvable:isvisible", /* from susetags */ "solvable:patchcategory", + "solvable:headerend", 0 }; Modified: trunk/sat-solver/src/pool.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.h?rev=9021&r1=9020&r2=9021&view=diff ============================================================================== --- trunk/sat-solver/src/pool.h (original) +++ trunk/sat-solver/src/pool.h Wed Mar 5 16:15:58 2008 @@ -103,8 +103,9 @@ #define SOLVABLE_ISVISIBLE 63 #define SOLVABLE_PATCHCATEGORY 64 +#define SOLVABLE_HEADEREND 65 -#define ID_NUM_INTERNAL 65 +#define ID_NUM_INTERNAL 66 /* well known solvable */ Modified: trunk/sat-solver/src/util.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/util.h?rev=9021&r1=9020&r2=9021&view=diff ============================================================================== --- trunk/sat-solver/src/util.h (original) +++ trunk/sat-solver/src/util.h Wed Mar 5 16:15:58 2008 @@ -44,11 +44,4 @@ return buf; } -static inline void *sat_extend_cleanup(void *buf, size_t len, size_t size) -{ - if (len) - buf = sat_realloc2(buf, len, size); - return buf; -} - #endif /* SATSOLVER_UTIL_H */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org