merge with debian/experimental

[apt.git] / ftparchive / multicompress.cc

diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc
index a80d6a34da940711062107cecec7ecde043a9e93..bf0f858d99fd5732c1603c551d0029457ddc265c 100644 (file)
--- a/ftparchive/multicompress.cc
+++ b/ftparchive/multicompress.cc
@@ -50,11 +50,11 @@ MultiCompress::MultiCompress(string const &Output,string const &Compress,
    string::const_iterator I = Compress.begin();
    for (; I != Compress.end();)
    {
    string::const_iterator I = Compress.begin();
    for (; I != Compress.end();)
    {

-      for (; I != Compress.end() && isspace(*I); I++);
+      for (; I != Compress.end() && isspace(*I); ++I);

       
       // Grab a word
       string::const_iterator Start = I;
       
       // Grab a word
       string::const_iterator Start = I;

-      for (; I != Compress.end() && !isspace(*I); I++);
+      for (; I != Compress.end() && !isspace(*I); ++I);

 
       // Find the matching compressor
       std::vector<APT::Configuration::Compressor> Compressors = APT::Configuration::getCompressors();
 
       // Find the matching compressor
       std::vector<APT::Configuration::Compressor> Compressors = APT::Configuration::getCompressors();


@@ -131,11 +131,11 @@ bool MultiCompress::GetStat(string const &Output,string const &Compress,struct s
    bool DidStat = false;
    for (; I != Compress.end();)
    {
    bool DidStat = false;
    for (; I != Compress.end();)
    {

-      for (; I != Compress.end() && isspace(*I); I++);
+      for (; I != Compress.end() && isspace(*I); ++I);

       
       // Grab a word
       string::const_iterator Start = I;
       
       // Grab a word
       string::const_iterator Start = I;

-      for (; I != Compress.end() && !isspace(*I); I++);
+      for (; I != Compress.end() && !isspace(*I); ++I);

 
       // Find the matching compressor
       std::vector<APT::Configuration::Compressor> Compressors = APT::Configuration::getCompressors();
 
       // Find the matching compressor
       std::vector<APT::Configuration::Compressor> Compressors = APT::Configuration::getCompressors();