poldek: poldek/pkgset-req.c - cmp by nevr

[mis]

Author: mis                          Date: Mon Jul  9 18:32:01 2007 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- cmp by nevr

---- Files affected:
poldek/poldek:
   pkgset-req.c (1.51 -> 1.52) 

---- Diffs:

================================================================
Index: poldek/poldek/pkgset-req.c
diff -u poldek/poldek/pkgset-req.c:1.51 poldek/poldek/pkgset-req.c:1.52
--- poldek/poldek/pkgset-req.c:1.51	Sun Jul  8 18:55:00 2007
+++ poldek/poldek/pkgset-req.c	Mon Jul  9 20:31:56 2007
@@ -71,7 +71,7 @@
 
 static int reqpkg_cmp(struct reqpkg *p1, struct reqpkg *p2)
 {
-    return (size_t)p1->pkg - (size_t)p2->pkg;
+    return pkg_cmp_id(p1->pkg, p2->pkg);
 }
 
 static struct pkg_unreq *pkg_unreq_new(struct capreq *req, int mismatch)
@@ -169,7 +169,7 @@
         n_assert(n_array_size(pkg->reqs));
         pkg->reqpkgs = n_array_new(n_array_size(pkg->reqs)/2+2, NULL,
                                    (tn_fn_cmp)reqpkg_cmp);
-
+        
         msgn(4, "%d. %s", i+1, pkg_id(pkg));
         for (j=0; j < n_array_size(pkg->reqs); j++) {
             struct pkg *pkgsbuf[1024], **suspkgs;
@@ -234,7 +234,7 @@
         n_array_push(pkg->reqpkgs, rpkg);
         n_array_sort(pkg->reqpkgs);
         if (dpkg->revreqpkgs == NULL)
-            dpkg->revreqpkgs = n_array_new(2, NULL, NULL);
+            dpkg->revreqpkgs = n_array_new(2, NULL, (tn_fn_cmp)pkg_cmp_id);
         n_array_push(dpkg->revreqpkgs, pkg);
     }
     
@@ -617,7 +617,7 @@
                 
                 rpkg->adds[i - 1] = reqpkg_new(dpkg, req, flags, 0);
                 if (dpkg->revreqpkgs == NULL)
-                    dpkg->revreqpkgs = n_array_new(2, NULL, NULL);
+                    dpkg->revreqpkgs = n_array_new(2, NULL, (tn_fn_cmp)pkg_nvr_strcmp);
                 n_array_push(dpkg->revreqpkgs, pkg);
             }
         }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/poldek/poldek/pkgset-req.c?r1=1.51&r2=1.52&f=u