poldek: poldek/capreq.c - killed needless pkg_version_compare() calls

[mis]

Author: mis                          Date: Sun Feb 24 12:47:48 2008 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- killed needless pkg_version_compare() calls

---- Files affected:
poldek/poldek:
   capreq.c (1.49 -> 1.50) 

---- Diffs:

================================================================
Index: poldek/poldek/capreq.c
diff -u poldek/poldek/capreq.c:1.49 poldek/poldek/capreq.c:1.50
--- poldek/poldek/capreq.c:1.49	Sat Feb  2 22:49:03 2008
+++ poldek/poldek/capreq.c	Sun Feb 24 13:47:43 2008
@@ -107,6 +107,10 @@
 int capreq_cmp_evr(const struct capreq *cr1, const struct capreq *cr2) 
 {
     register int rc;
+    const char *r1, *r2;
+    
+    if (!capreq_versioned(cr1) && !capreq_versioned(cr2))
+        return 0;
     
     if (capreq_versioned(cr1) && !capreq_versioned(cr2))
         return 1;
@@ -119,8 +123,13 @@
 
     if ((rc = pkg_version_compare(capreq_ver(cr1), capreq_ver(cr2))))
         return rc;
+
+    r1 = capreq_rel(cr1);
+    r2 = capreq_rel(cr2);
+    if (*r1 == '\0' && *r2 == '\0')
+        return 0;
     
-    if ((rc = pkg_version_compare(capreq_rel(cr1), capreq_rel(cr2))))
+    if ((rc = pkg_version_compare(r1, r2)))
         return rc;
     
     return cr1->cr_relflags - cr2->cr_relflags;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/capreq.c?r1=1.49&r2=1.50&f=u