Merge branch 'feature/edit-sources' into debian/sid

[apt.git] / ftparchive / override.cc

diff --git a/ftparchive/override.cc b/ftparchive/override.cc
index a101fa6d114935640378e609e3ebb582203ac3c1..1288ff133483c83fb9289520649bb26a12e6aa55 100644 (file)
--- a/ftparchive/override.cc
+++ b/ftparchive/override.cc
@@ -12,13 +12,14 @@
 // Include Files                                                       /*{{{*/
 #include <config.h>
 
-#include <apti18n.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 
 #include <stdio.h>
 
 #include "override.h"
+
+#include <apti18n.h>
                                                                        /*}}}*/
 
 // Override::ReadOverride - Read the override file                     /*{{{*/
@@ -48,7 +49,7 @@ bool Override::ReadOverride(string const &File,bool const &Source)
       // Strip space leading up to the package name, skip blank lines
       char *Pkg = Line;
       for (; isspace(*Pkg) && *Pkg != 0;Pkg++);
-      if (Pkg == 0)
+      if (*Pkg == 0)
         continue;
 
       // Find the package and zero..
@@ -231,7 +232,7 @@ Override::Item* Override::GetItem(string const &Package, string const &Architect
         if (R->OldMaint != "") result->OldMaint = R->OldMaint;
         if (R->NewMaint != "") result->NewMaint = R->NewMaint;
         for (map<string,string>::const_iterator foI = R->FieldOverride.begin();
-             foI != R->FieldOverride.end(); foI++)
+             foI != R->FieldOverride.end(); ++foI)
          {
            result->FieldOverride[foI->first] = foI->second;
         }
@@ -268,7 +269,7 @@ string Override::Item::SwapMaint(string const &Orig,bool &Failed)
       string::const_iterator Start = End;      
       for (; End < OldMaint.end() &&
           (End + 3 >= OldMaint.end() || End[0] != ' ' || 
-           End[1] != '/' || End[2] != '/'); End++);
+           End[1] != '/' || End[2] != '/'); ++End);
       if (stringcasecmp(Start,End,Orig.begin(),Orig.end()) == 0)
         return NewMaint;
       
@@ -276,7 +277,7 @@ string Override::Item::SwapMaint(string const &Orig,bool &Failed)
         break;
 
       // Skip the divider and white space
-      for (; End < OldMaint.end() && (*End == '/' || *End == ' '); End++);
+      for (; End < OldMaint.end() && (*End == '/' || *End == ' '); ++End);
    }
 #else
    if (stringcasecmp(OldMaint.begin(),OldMaint.end(),Orig.begin(),Orig.end()) == 0)