- get rid of unused pool argument in solvable_identical

diff --git a/src/pool.h b/src/pool.h
index 0aef956558346ef8e0e6aaa6e27f976a8eae0f34..7e38666121254b2ff0c4a10970562bc92c5fcd1a 100644 (file)
--- a/src/pool.h
+++ b/src/pool.h
@@ -193,7 +193,7 @@ int solvable_lookup_void(Solvable *s, Id keyname);
 char * solvable_get_location(Solvable *s, unsigned int *medianrp);
 const unsigned char *solvable_lookup_bin_checksum(Solvable *s, Id keyname, Id *typep);
 const char *solvable_lookup_checksum(Solvable *s, Id keyname, Id *typep);
-int solvable_identical(Pool *pool, Solvable *s1, Solvable *s2);
+int solvable_identical(Solvable *s1, Solvable *s2);
 
 int solvable_trivial_installable_map(Solvable *s, Map *installedmap, Map *conflictsmap);
 int solvable_trivial_installable_repo(Solvable *s, struct _Repo *installed);

diff --git a/src/solvable.c b/src/solvable.c
index 0174ee50f0b4b5a70d9d75cac4be88665b07a831..96e329bd6e4f42b9571606c56b30e1c1dd694a33 100644 (file)
--- a/src/solvable.c
+++ b/src/solvable.c
@@ -469,8 +469,11 @@ pool_create_state_maps(Pool *pool, Queue *installed, Map *installedmap, Map *con
     }
 }
 
+/* Tests if two solvables have identical content. Currently
+ * both solvables need to come from the same pool */
+
 int
-solvable_identical(Pool *pool, Solvable *s1, Solvable *s2)
+solvable_identical(Solvable *s1, Solvable *s2)
 {
   unsigned int bt1, bt2;
   Id rq1, rq2;

diff --git a/src/solver.c b/src/solver.c
index 923cb33f1b91cee5d1483b4845408d00031987e4..415438303bc1e2fe79994122f547cf252f233e1e 100644 (file)
--- a/src/solver.c
+++ b/src/solver.c
@@ -1484,7 +1484,7 @@ finddistupgradepackages(Solver *solv, Solvable *s, Queue *qs, int allow_all)
   for (i = 0; i < qs->count; i++)
     {
       Solvable *ns = pool->solvables + qs->elements[i];
-      if (s->evr == ns->evr && solvable_identical(pool, s, ns))
+      if (s->evr == ns->evr && solvable_identical(s, ns))
         return s - pool->solvables;
     }
   /* nope, it must be some other package */