merged from the debian-sid branch

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

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 2b6d294fbf79aab1fecf56ab274556e09a378410..f41bb5a0a571733014d6e5c6eda2192ae0e63e37 100644 (file)
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -221,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;


@@ -230,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) 
                {


@@ -396,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())
         {


@@ -512,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();


@@ -569,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;


@@ -624,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();


@@ -635,9 +635,11 @@ 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)

            {
            {

-              char const * const Arch = P.Arch();
+               // copy P.Arch() into a string here as a cache remap
+               // in NewDepends() later may alter the pointer location
+              string Arch = P.Arch() == NULL ? "" : P.Arch();

               map_ptrloc *OldDepLast = NULL;
               /* MultiArch handling introduces a lot of implicit Dependencies:
                - MultiArch: same → Co-Installable if they have the same version
               map_ptrloc *OldDepLast = NULL;
               /* MultiArch handling introduces a lot of implicit Dependencies:
                - MultiArch: same → Co-Installable if they have the same version


@@ -646,7 +648,7 @@ bool pkgCacheGenerator::FinishCache(OpProgress *Progress)
               bool const coInstall = ((V->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same);
               for (vector<string>::const_iterator A = archs.begin(); A != archs.end(); ++A)
               {
               bool const coInstall = ((V->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same);
               for (vector<string>::const_iterator A = archs.begin(); A != archs.end(); ++A)
               {

-                 if (Arch == 0 || *A == Arch)
+                 if (*A == Arch)

                     continue;
                  /* We allow only one installed arch at the time
                     per group, therefore each group member conflicts
                     continue;
                  /* We allow only one installed arch at the time
                     per group, therefore each group member conflicts


@@ -727,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;


@@ -934,7 +936,7 @@ static bool CheckValidity(const string &CacheFile,
       return false;
    }
 
       return false;
    }
 

-   if (List.GetLastModifiedTime() < GetModificationTime(CacheFile))
+   if (List.GetLastModifiedTime() > GetModificationTime(CacheFile))

    {
       if (Debug == true)
         std::clog << "sources.list is newer than the cache" << std::endl;
    {
       if (Debug == true)
         std::clog << "sources.list is newer than the cache" << std::endl;


@@ -957,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() << ": ";


@@ -1024,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;      


@@ -1042,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;


@@ -1072,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)


@@ -1119,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);
    }