correct some style/performance/warnings from cppcheck

[apt.git] / apt-private / private-list.cc

diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc
index 680a9a53515f38931a62d3e55c45d05f27b1b8b3..898ee7222a517afb1f7f2b854822f0044381b858 100644 (file)
--- a/apt-private/private-list.cc
+++ b/apt-private/private-list.cc
@@ -61,7 +61,7 @@ class PackageNameMatcher : public Matcher                             /*{{{*/
   public:
    PackageNameMatcher(const char **patterns)
    {
   public:
    PackageNameMatcher(const char **patterns)
    {

-      for(int i=0; patterns[i] != NULL; i++)
+      for(int i=0; patterns[i] != NULL; ++i)

       {
          std::string pattern = patterns[i];
 #ifdef PACKAGE_MATCHER_ABI_COMPAT
       {
          std::string pattern = patterns[i];
 #ifdef PACKAGE_MATCHER_ABI_COMPAT


@@ -79,12 +79,12 @@ class PackageNameMatcher : public Matcher                           /*{{{*/
    }
    virtual ~PackageNameMatcher()
    {
    }
    virtual ~PackageNameMatcher()
    {

-      for(J=filters.begin(); J != filters.end(); J++)
+      for(J=filters.begin(); J != filters.end(); ++J)

          delete *J;
    }
    virtual bool operator () (const pkgCache::PkgIterator &P) 
    {
          delete *J;
    }
    virtual bool operator () (const pkgCache::PkgIterator &P) 
    {

-      for(J=filters.begin(); J != filters.end(); J++)
+      for(J=filters.begin(); J != filters.end(); ++J)

       {
          APT::CacheFilter::PackageMatcher *cachefilter = *J;
          if((*cachefilter)(P)) 
       {
          APT::CacheFilter::PackageMatcher *cachefilter = *J;
          if((*cachefilter)(P)) 


@@ -104,7 +104,7 @@ void ListAllVersions(pkgCacheFile &CacheFile, pkgRecords &records,  /*{{{*/
                      std::ostream &outs)
 {
    for (pkgCache::VerIterator Ver = P.VersionList();
                      std::ostream &outs)
 {
    for (pkgCache::VerIterator Ver = P.VersionList();

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

       ListSingleVersion(CacheFile, records, Ver, outs);
 }
                                                                        /*}}}*/
       ListSingleVersion(CacheFile, records, Ver, outs);
 }
                                                                        /*}}}*/


@@ -132,6 +132,8 @@ bool List(CommandLine &Cmd)
    std::map<std::string, std::string> output_map;
    std::map<std::string, std::string>::const_iterator K;
 
    std::map<std::string, std::string> output_map;
    std::map<std::string, std::string>::const_iterator K;
 

+   bool includeSummary = _config->FindB("APT::Cmd::List-Include-Summary");
+

    PackageNameMatcher matcher(patterns);
    LocalitySortedVersionSet bag;
    OpTextProgress progress;
    PackageNameMatcher matcher(patterns);
    LocalitySortedVersionSet bag;
    OpTextProgress progress;


@@ -140,7 +142,7 @@ bool List(CommandLine &Cmd)
                             Cache->Head().PackageCount,
                             _("Listing"));
    GetLocalitySortedVersionSet(CacheFile, bag, matcher, progress);
                             Cache->Head().PackageCount,
                             _("Listing"));
    GetLocalitySortedVersionSet(CacheFile, bag, matcher, progress);

-   for (LocalitySortedVersionSet::iterator V = bag.begin(); V != bag.end(); V++)
+   for (LocalitySortedVersionSet::iterator V = bag.begin(); V != bag.end(); ++V)

    {
       std::stringstream outs;
       if(_config->FindB("APT::Cmd::All-Versions", false) == true)
    {
       std::stringstream outs;
       if(_config->FindB("APT::Cmd::All-Versions", false) == true)


@@ -149,7 +151,7 @@ bool List(CommandLine &Cmd)
          output_map.insert(std::make_pair<std::string, std::string>(
             V.ParentPkg().Name(), outs.str()));
       } else {
          output_map.insert(std::make_pair<std::string, std::string>(
             V.ParentPkg().Name(), outs.str()));
       } else {

-         ListSingleVersion(CacheFile, records, V, outs, false);
+         ListSingleVersion(CacheFile, records, V, outs, includeSummary);

          output_map.insert(std::make_pair<std::string, std::string>(
                            V.ParentPkg().Name(), outs.str()));
       }
          output_map.insert(std::make_pair<std::string, std::string>(
                            V.ParentPkg().Name(), outs.str()));
       }


@@ -157,7 +159,7 @@ bool List(CommandLine &Cmd)
 
    // FIXME: SORT! and make sorting flexible (alphabetic, by pkg status)
    // output the sorted map
 
    // FIXME: SORT! and make sorting flexible (alphabetic, by pkg status)
    // output the sorted map

-   for (K = output_map.begin(); K != output_map.end(); K++)
+   for (K = output_map.begin(); K != output_map.end(); ++K)

       std::cout << (*K).second << std::endl;
 
 
       std::cout << (*K).second << std::endl;