cleanup code now that the vendorcheck callback is in the pool

[platform/upstream/libsolv.git] / src / solver.c

diff --git a/src/solver.c b/src/solver.c
index e0ca140..c1518db 100644 (file)
--- a/src/solver.c
+++ b/src/solver.c
@@ -965,11 +965,11 @@ solver_reset(Solver *solv)
       v = solv->decisionq.elements[i];
       solv->decisionmap[v > 0 ? v : -v] = 0;
     }
-  solv->decisionq_why.count = 0;
-  solv->decisionq.count = 0;
+  queue_empty(&solv->decisionq_why);
+  queue_empty(&solv->decisionq);
   solv->recommends_index = -1;
   solv->propagate_index = 0;
-  solv->branches.count = 0;
+  queue_empty(&solv->branches);
 
   /* adapt learnt rule status to new set of enabled/disabled rules */
   enabledisablelearntrules(solv);
@@ -3911,7 +3911,7 @@ solver_trivial_installable(Solver *solv, Queue *pkgs, Queue *res)
     if (res->elements[i] != -1)
       {
        Solvable *s = pool->solvables + pkgs->elements[i];
-       if (!strncmp("patch:", pool_id2str(pool, s->name), 6) && solvable_is_irrelevant_patch(s, &installedmap, solv))
+       if (!strncmp("patch:", pool_id2str(pool, s->name), 6) && solvable_is_irrelevant_patch(s, &installedmap))
          res->elements[i] = -1;
       }
   map_free(&installedmap);