Mailinglist Archive: zypp-commit (266 mails)

< Previous Next >
[zypp-commit] r11681 - in /trunk/sat-solver/src: policy.c solver.c
  • From: mlschroe@xxxxxxxxxxxxxxxx
  • Date: Fri, 14 Nov 2008 11:55:08 -0000
  • Message-id: <20081114115508.5CED43A1F4@xxxxxxxxxxxxxxxx>
Author: mlschroe
Date: Fri Nov 14 12:55:08 2008
New Revision: 11681

URL: http://svn.opensuse.org/viewcvs/zypp?rev=11681&view=rev
Log:
- fix mem leak
- use EVRCMP_COMPARE instead of MATCH_RELEASE when comparing evrs.

Modified:
trunk/sat-solver/src/policy.c
trunk/sat-solver/src/solver.c

Modified: trunk/sat-solver/src/policy.c
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/policy.c?rev=11681&r1=11680&r2=11681&view=diff
==============================================================================
--- trunk/sat-solver/src/policy.c (original)
+++ trunk/sat-solver/src/policy.c Fri Nov 14 12:55:08 2008
@@ -294,7 +294,7 @@

if (pool->solvables[best].evr != s->evr) /* compare evr */
{
- if (evrcmp(pool, pool->solvables[best].evr, s->evr,
EVRCMP_MATCH_RELEASE) < 0)
+ if (evrcmp(pool, pool->solvables[best].evr, s->evr, EVRCMP_COMPARE)
< 0)
best = plist->elements[i];
}
}
@@ -429,7 +429,7 @@
ps = pool->solvables + p;
if (s->name == ps->name) /* name match */
{
- if (!allow_all && !solv->allowdowngrade && evrcmp(pool, s->evr,
ps->evr, EVRCMP_MATCH_RELEASE) > 0)
+ if (!allow_all && !solv->allowdowngrade && evrcmp(pool, s->evr,
ps->evr, EVRCMP_COMPARE) > 0)
continue;
}
else if (!solv->noupdateprovide && ps->obsoletes) /*
provides/obsoletes combination ? */

Modified: trunk/sat-solver/src/solver.c
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=11681&r1=11680&r2=11681&view=diff
==============================================================================
--- trunk/sat-solver/src/solver.c (original)
+++ trunk/sat-solver/src/solver.c Fri Nov 14 12:55:08 2008
@@ -2508,6 +2508,7 @@
if (analyze_unsolvable(solv, r, disablerules))
continue;
queue_free(&dq);
+ queue_free(&dqs);
return;
}
}
@@ -2556,6 +2557,7 @@
if (level == 0)
{
queue_free(&dq);
+ queue_free(&dqs);
return;
}
if (level <= olevel)
@@ -2601,6 +2603,7 @@
if (level == 0) /* unsolvable */
{
queue_free(&dq);
+ queue_free(&dqs);
return;
}
if (level <= olevel)
@@ -2638,6 +2641,7 @@
if (level == 0)
{
queue_free(&dq);
+ queue_free(&dqs);
return;
}
if (level <= olevel)
@@ -2659,6 +2663,7 @@
if (level == 0)
{
queue_free(&dq);
+ queue_free(&dqs);
return;
}
if (level <= olevel)
@@ -2721,6 +2726,7 @@
if (level == 0)
{
queue_free(&dq);
+ queue_free(&dqs);
return;
}
if (level <= olevel)
@@ -2813,6 +2819,7 @@
if (level == 0)
{
queue_free(&dq);
+ queue_free(&dqs);
return;
}
if (level < systemlevel)
@@ -2976,6 +2983,7 @@
if (level == 0)
{
queue_free(&dq);
+ queue_free(&dqs);
return;
}
continue;
@@ -3014,6 +3022,7 @@
if (level == 0)
{
queue_free(&dq);
+ queue_free(&dqs);
return;
}
continue;

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages