rework dpkg-wrapping in test framework

[apt.git] / apt-pkg / deb / debversion.cc

diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc
index 94d357846761d973fd49f065d3e62b246099f911..a5eacb7f50f2a9f0ae1876906b598d743f1d33c3 100644 (file)
--- a/apt-pkg/deb/debversion.cc
+++ b/apt-pkg/deb/debversion.cc
@@ -15,6 +15,8 @@
 #include <apt-pkg/debversion.h>
 #include <apt-pkg/pkgcache.h>
 
 #include <apt-pkg/debversion.h>
 #include <apt-pkg/pkgcache.h>
 

+#include <string.h>
+#include <string>

 #include <stdlib.h>
 #include <ctype.h>
                                                                        /*}}}*/
 #include <stdlib.h>
 #include <ctype.h>
                                                                        /*}}}*/


@@ -116,7 +118,7 @@ int debVersioningSystem::CmpFragment(const char *A,const char *AEnd,
       return 1;
    }
 
       return 1;
    }
 

-   // Shouldnt happen
+   // Shouldn't happen

    return 1;
 }
                                                                        /*}}}*/
    return 1;
 }
                                                                        /*}}}*/


@@ -217,16 +219,12 @@ bool debVersioningSystem::CheckDep(const char *PkgVer,
       return false;
    Op &= 0x0F;
 
       return false;
    Op &= 0x0F;
 

-   size_t const lenPkgVer = strlen(PkgVer);
-   size_t const lenDepVer = strlen(DepVer);
+   // fast track for (equal) strings [by location] which are by definition equal versions
+   if (PkgVer == DepVer)
+      return Op == pkgCache::Dep::Equals || Op == pkgCache::Dep::LessEq || Op == pkgCache::Dep::GreaterEq;

 
 

-   // take a shortcut for equals which are string-equal as well
-   if (Op == pkgCache::Dep::Equals && lenPkgVer == lenDepVer &&
-        memcmp(PkgVer, DepVer, lenPkgVer) == 0)
-      return true;
-
-   // Perform the actual comparision.
-   int const Res = DoCmpVersion(PkgVer, PkgVer + lenPkgVer, DepVer, DepVer + lenDepVer);
+   // Perform the actual comparison.
+   int const Res = CmpVersion(PkgVer, DepVer);

    switch (Op)
    {
       case pkgCache::Dep::LessEq:
    switch (Op)
    {
       case pkgCache::Dep::LessEq: