Merge branch 'debian/jessie' into debian/experimental

[apt.git] / apt-pkg / versionmatch.cc

diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc
index c23b4c3bfdff35ad3e99fe6a2b31d82ee7108ca7..284098bdf275da546fd97bcc6ed6d86dfa667913 100644 (file)
--- a/apt-pkg/versionmatch.cc
+++ b/apt-pkg/versionmatch.cc
@@ -16,14 +16,21 @@
 #include <apt-pkg/versionmatch.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/versionmatch.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>

+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>

 
 

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

 #include <stdio.h>
 #include <ctype.h>
 #include <fnmatch.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <fnmatch.h>

-#include <sys/types.h>

 #include <regex.h>
                                                                        /*}}}*/
 
 #include <regex.h>
                                                                        /*}}}*/
 

+using std::string;
+

 // VersionMatch::pkgVersionMatch - Constructor                         /*{{{*/
 // ---------------------------------------------------------------------
 /* Break up the data string according to the selected type */
 // VersionMatch::pkgVersionMatch - Constructor                         /*{{{*/
 // ---------------------------------------------------------------------
 /* Break up the data string according to the selected type */


@@ -60,7 +67,7 @@ pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type)
       
       // Are we a simple specification?
       string::const_iterator I = Data.begin();
       
       // Are we a simple specification?
       string::const_iterator I = Data.begin();

-      for (; I != Data.end() && *I != '='; I++);
+      for (; I != Data.end() && *I != '='; ++I);

       if (I == Data.end())
       {
         // Temporary
       if (I == Data.end())
       {
         // Temporary


@@ -152,7 +159,7 @@ bool pkgVersionMatch::MatchVer(const char *A,string B,bool Prefix)
 pkgCache::VerIterator pkgVersionMatch::Find(pkgCache::PkgIterator Pkg)
 {
    pkgCache::VerIterator Ver = Pkg.VersionList();
 pkgCache::VerIterator pkgVersionMatch::Find(pkgCache::PkgIterator Pkg)
 {
    pkgCache::VerIterator Ver = Pkg.VersionList();

-   for (; Ver.end() == false; Ver++)
+   for (; Ver.end() == false; ++Ver)

    {
       if (Type == Version)
       {
    {
       if (Type == Version)
       {


@@ -163,7 +170,7 @@ pkgCache::VerIterator pkgVersionMatch::Find(pkgCache::PkgIterator Pkg)
         continue;
       }
       
         continue;
       }
       

-      for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; VF++)
+      for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; ++VF)

         if (FileMatch(VF.File()) == true)
            return Ver;
    }
         if (FileMatch(VF.File()) == true)
            return Ver;
    }


@@ -179,9 +186,9 @@ pkgCache::VerIterator pkgVersionMatch::Find(pkgCache::PkgIterator Pkg)
 bool pkgVersionMatch::ExpressionMatches(const char *pattern, const char *string)
 {
    if (pattern[0] == '/') {
 bool pkgVersionMatch::ExpressionMatches(const char *pattern, const char *string)
 {
    if (pattern[0] == '/') {

-      bool res = false;

       size_t length = strlen(pattern);
       if (pattern[length - 1] == '/') {
       size_t length = strlen(pattern);
       if (pattern[length - 1] == '/') {

+        bool res = false;

         regex_t preg;
         char *regex = strdup(pattern + 1);
         regex[length - 2] = '\0';
         regex_t preg;
         char *regex = strdup(pattern + 1);
         regex[length - 2] = '\0';