load the dpkg base arguments only one time and reuse them later

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

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 7539e1b94d370018296e10b9841b06b7b02fe931..f7e01f60b12c873fa0f3721633edf394199ac046 100644 (file)
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -10,7 +10,7 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#define APT_COMPATIBILITY 986
+#include <config.h>

 
 #include <apt-pkg/pkgcachegen.h>
 #include <apt-pkg/error.h>
 
 #include <apt-pkg/pkgcachegen.h>
 #include <apt-pkg/error.h>


@@ -23,17 +23,17 @@
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/macros.h>

-

 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/tagfile.h>

-
-#include <apti18n.h>
+#include <apt-pkg/metaindex.h>
+#include <apt-pkg/fileutl.h>

 
 #include <vector>
 
 #include <vector>

-

 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdio.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdio.h>

+
+#include <apti18n.h>

                                                                        /*}}}*/
 typedef vector<pkgIndexFile *>::iterator FileIterator;
 template <typename Iter> std::vector<Iter*> pkgCacheGenerator::Dynamic<Iter>::toReMap;
                                                                        /*}}}*/
 typedef vector<pkgIndexFile *>::iterator FileIterator;
 template <typename Iter> std::vector<Iter*> pkgCacheGenerator::Dynamic<Iter>::toReMap;


@@ -98,6 +98,7 @@ pkgCacheGenerator::~pkgCacheGenerator()
       return;
    
    Cache.HeaderP->Dirty = false;
       return;
    
    Cache.HeaderP->Dirty = false;

+   Cache.HeaderP->CacheFileSize = Map.Size();

    Map.Sync(0,sizeof(pkgCache::Header));
 }
                                                                        /*}}}*/
    Map.Sync(0,sizeof(pkgCache::Header));
 }
                                                                        /*}}}*/


@@ -220,7 +221,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
 
            // don't add a new description if we have one for the given
            // md5 && language
 
            // don't add a new description if we have one for the given
            // md5 && language

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

               if (MD5SumValue(Desc.md5()) == CurMd5 && 
                   Desc.LanguageCode() == List.DescriptionLanguage())
                  duplicate=true;
               if (MD5SumValue(Desc.md5()) == CurMd5 && 
                   Desc.LanguageCode() == List.DescriptionLanguage())
                  duplicate=true;


@@ -229,7 +230,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
            
            for (Desc = Ver.DescriptionList();
                 Desc.end() == false;
            
            for (Desc = Ver.DescriptionList();
                 Desc.end() == false;

-                LastDesc = &Desc->NextDesc, Desc++)
+                LastDesc = &Desc->NextDesc, ++Desc)

            {
               if (MD5SumValue(Desc.md5()) == CurMd5) 
                {
            {
               if (MD5SumValue(Desc.md5()) == CurMd5) 
                {


@@ -395,7 +396,7 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List)
       unsigned long Hash = List.VersionHash();
       pkgCache::VerIterator Ver = Pkg.VersionList();
       Dynamic<pkgCache::VerIterator> DynVer(Ver);
       unsigned long Hash = List.VersionHash();
       pkgCache::VerIterator Ver = Pkg.VersionList();
       Dynamic<pkgCache::VerIterator> DynVer(Ver);

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

       {
         if (Ver->Hash == Hash && Version.c_str() == Ver.VerStr())
         {
       {
         if (Ver->Hash == Hash && Version.c_str() == Ver.VerStr())
         {


@@ -511,7 +512,7 @@ bool pkgCacheGenerator::NewFileVer(pkgCache::VerIterator &Ver,
    
    // Link it to the end of the list
    map_ptrloc *Last = &Ver->FileList;
    
    // Link it to the end of the list
    map_ptrloc *Last = &Ver->FileList;

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

       Last = &V->NextFile;
    VF->NextFile = *Last;
    *Last = VF.Index();
       Last = &V->NextFile;
    VF->NextFile = *Last;
    *Last = VF.Index();


@@ -568,7 +569,7 @@ bool pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator &Desc,
 
    // Link it to the end of the list
    map_ptrloc *Last = &Desc->FileList;
 
    // Link it to the end of the list
    map_ptrloc *Last = &Desc->FileList;

-   for (pkgCache::DescFileIterator D = Desc.FileList(); D.end() == false; D++)
+   for (pkgCache::DescFileIterator D = Desc.FileList(); D.end() == false; ++D)

       Last = &D->NextFile;
 
    DF->NextFile = *Last;
       Last = &D->NextFile;
 
    DF->NextFile = *Last;


@@ -623,7 +624,7 @@ bool pkgCacheGenerator::FinishCache(OpProgress *Progress)
       // Create Conflicts in between the group
       pkgCache::GrpIterator G = GetCache().GrpBegin();
       Dynamic<pkgCache::GrpIterator> DynG(G);
       // Create Conflicts in between the group
       pkgCache::GrpIterator G = GetCache().GrpBegin();
       Dynamic<pkgCache::GrpIterator> DynG(G);

-      for (; G.end() != true; G++)
+      for (; G.end() != true; ++G)

       {
         string const PkgName = G.Name();
         pkgCache::PkgIterator P = G.PackageList();
       {
         string const PkgName = G.Name();
         pkgCache::PkgIterator P = G.PackageList();


@@ -634,7 +635,7 @@ bool pkgCacheGenerator::FinishCache(OpProgress *Progress)
            Dynamic<pkgCache::PkgIterator> DynallPkg(allPkg);
            pkgCache::VerIterator V = P.VersionList();
            Dynamic<pkgCache::VerIterator> DynV(V);
            Dynamic<pkgCache::PkgIterator> DynallPkg(allPkg);
            pkgCache::VerIterator V = P.VersionList();
            Dynamic<pkgCache::VerIterator> DynV(V);

-           for (; V.end() != true; V++)
+           for (; V.end() != true; ++V)

            {
                // copy P.Arch() into a string here as a cache remap
                // in NewDepends() later may alter the pointer location
            {
                // copy P.Arch() into a string here as a cache remap
                // in NewDepends() later may alter the pointer location


@@ -728,7 +729,7 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg,
    if (OldDepLast == NULL)
    {
       OldDepLast = &Ver->DependsList;
    if (OldDepLast == NULL)
    {
       OldDepLast = &Ver->DependsList;

-      for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++)
+      for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; ++D)

         OldDepLast = &D->NextDepends;
    } else if (oldMap != Map.Data())
       OldDepLast += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap;
         OldDepLast = &D->NextDepends;
    } else if (oldMap != Map.Data())
       OldDepLast += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap;


@@ -958,7 +959,7 @@ static bool CheckValidity(const string &CacheFile,
       verify the IMS data and check that it is on the disk too.. */
    SPtrArray<bool> Visited = new bool[Cache.HeaderP->PackageFileCount];
    memset(Visited,0,sizeof(*Visited)*Cache.HeaderP->PackageFileCount);
       verify the IMS data and check that it is on the disk too.. */
    SPtrArray<bool> Visited = new bool[Cache.HeaderP->PackageFileCount];
    memset(Visited,0,sizeof(*Visited)*Cache.HeaderP->PackageFileCount);

-   for (; Start != End; Start++)
+   for (; Start != End; ++Start)

    {
       if (Debug == true)
         std::clog << "Checking PkgFile " << (*Start)->Describe() << ": ";
    {
       if (Debug == true)
         std::clog << "Checking PkgFile " << (*Start)->Describe() << ": ";


@@ -1025,7 +1026,7 @@ static bool CheckValidity(const string &CacheFile,
 static unsigned long ComputeSize(FileIterator Start,FileIterator End)
 {
    unsigned long TotalSize = 0;
 static unsigned long ComputeSize(FileIterator Start,FileIterator End)
 {
    unsigned long TotalSize = 0;

-   for (; Start != End; Start++)
+   for (; Start != End; ++Start)

    {
       if ((*Start)->HasPackages() == false)
         continue;      
    {
       if ((*Start)->HasPackages() == false)
         continue;      


@@ -1043,7 +1044,7 @@ static bool BuildCache(pkgCacheGenerator &Gen,
                       FileIterator Start, FileIterator End)
 {
    FileIterator I;
                       FileIterator Start, FileIterator End)
 {
    FileIterator I;

-   for (I = Start; I != End; I++)
+   for (I = Start; I != End; ++I)

    {
       if ((*I)->HasPackages() == false)
         continue;
    {
       if ((*I)->HasPackages() == false)
         continue;


@@ -1073,7 +1074,7 @@ static bool BuildCache(pkgCacheGenerator &Gen,
         Progress->Done();
       TotalSize = ComputeSize(Start, End);
       CurrentSize = 0;
         Progress->Done();
       TotalSize = ComputeSize(Start, End);
       CurrentSize = 0;

-      for (I = Start; I != End; I++)
+      for (I = Start; I != End; ++I)

       {
         unsigned long Size = (*I)->Size();
         if (Progress != NULL)
       {
         unsigned long Size = (*I)->Size();
         if (Progress != NULL)


@@ -1120,12 +1121,12 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress
    vector<pkgIndexFile *> Files;
    for (vector<metaIndex *>::const_iterator i = List.begin();
         i != List.end();
    vector<pkgIndexFile *> Files;
    for (vector<metaIndex *>::const_iterator i = List.begin();
         i != List.end();

-        i++)
+        ++i)

    {
       vector <pkgIndexFile *> *Indexes = (*i)->GetIndexFiles();
       for (vector<pkgIndexFile *>::const_iterator j = Indexes->begin();
           j != Indexes->end();
    {
       vector <pkgIndexFile *> *Indexes = (*i)->GetIndexFiles();
       for (vector<pkgIndexFile *>::const_iterator j = Indexes->begin();
           j != Indexes->end();

-          j++)
+          ++j)

          Files.push_back (*j);
    }
    
          Files.push_back (*j);
    }