Merge remote-tracking branch 'origin/feature/source-deb822' into feature/source-deb822

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

diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc
index 46a02b55c3592abb483d0a4274918e4eff75c604..2975599574fc9a67842a9ceb4628dccc71874a23 100644 (file)
--- a/apt-pkg/srcrecords.cc
+++ b/apt-pkg/srcrecords.cc
@@ -11,24 +11,27 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include<config.h>
+

 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/strutl.h>

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

                                                                        /*}}}*/
 
 // SrcRecords::pkgSrcRecords - Constructor                             /*{{{*/
 // ---------------------------------------------------------------------
 /* Open all the source index files */
                                                                        /*}}}*/
 
 // SrcRecords::pkgSrcRecords - Constructor                             /*{{{*/
 // ---------------------------------------------------------------------
 /* Open all the source index files */

-pkgSrcRecords::pkgSrcRecords(pkgSourceList &List) : Files(0), Current(0)
+pkgSrcRecords::pkgSrcRecords(pkgSourceList &List) : d(NULL), Files(0), Current(0)

 {
 {

-   for (pkgSourceList::const_iterator I = List.begin(); I != List.end(); I++)
+   for (pkgSourceList::const_iterator I = List.begin(); I != List.end(); ++I)

    {
    {

-      vector<pkgIndexFile *> *Indexes = (*I)->GetIndexFiles();
-      for (vector<pkgIndexFile *>::const_iterator J = Indexes->begin();
-          J != Indexes->end(); J++)
+      std::vector<pkgIndexFile *> *Indexes = (*I)->GetIndexFiles();
+      for (std::vector<pkgIndexFile *>::const_iterator J = Indexes->begin();
+          J != Indexes->end(); ++J)

       {
          Parser* P = (*J)->CreateSrcParser();
         if (_error->PendingError() == true)
       {
          Parser* P = (*J)->CreateSrcParser();
         if (_error->PendingError() == true)


@@ -39,7 +42,7 @@ pkgSrcRecords::pkgSrcRecords(pkgSourceList &List) : Files(0), Current(0)
    }
    
    // Doesn't work without any source index files
    }
    
    // Doesn't work without any source index files

-   if (Files.size() == 0)
+   if (Files.empty() == true)

    {
       _error->Error(_("You must put some 'source' URIs"
                    " in your sources.list"));
    {
       _error->Error(_("You must put some 'source' URIs"
                    " in your sources.list"));


@@ -55,7 +58,7 @@ pkgSrcRecords::pkgSrcRecords(pkgSourceList &List) : Files(0), Current(0)
 pkgSrcRecords::~pkgSrcRecords()
 {
    // Blow away all the parser objects
 pkgSrcRecords::~pkgSrcRecords()
 {
    // Blow away all the parser objects

-   for(vector<Parser*>::iterator I = Files.begin(); I != Files.end(); ++I)
+   for(std::vector<Parser*>::iterator I = Files.begin(); I != Files.end(); ++I)

       delete *I;
 }
                                                                        /*}}}*/
       delete *I;
 }
                                                                        /*}}}*/


@@ -65,8 +68,8 @@ pkgSrcRecords::~pkgSrcRecords()
 bool pkgSrcRecords::Restart()
 {
    Current = Files.begin();
 bool pkgSrcRecords::Restart()
 {
    Current = Files.begin();

-   for (vector<Parser*>::iterator I = Files.begin();
-        I != Files.end(); I++)
+   for (std::vector<Parser*>::iterator I = Files.begin();
+        I != Files.end(); ++I)

       (*I)->Restart();
    
    return true;
       (*I)->Restart();
    
    return true;


@@ -89,7 +92,7 @@ pkgSrcRecords::Parser *pkgSrcRecords::Find(const char *Package,bool const &SrcOn
       {
         if (_error->PendingError() == true)
            return 0;
       {
         if (_error->PendingError() == true)
            return 0;

-        Current++;
+        ++Current;

         if (Current == Files.end())
            return 0;
       }
         if (Current == Files.end())
            return 0;
       }


@@ -107,7 +110,7 @@ pkgSrcRecords::Parser *pkgSrcRecords::Find(const char *Package,bool const &SrcOn
       
       // Check for a binary hit
       const char **I = (*Current)->Binaries();
       
       // Check for a binary hit
       const char **I = (*Current)->Binaries();

-      for (; I != 0 && *I != 0; I++)
+      for (; I != 0 && *I != 0; ++I)

         if (strcmp(Package,*I) == 0)
            return *Current;
    }
         if (strcmp(Package,*I) == 0)
            return *Current;
    }


@@ -118,14 +121,13 @@ pkgSrcRecords::Parser *pkgSrcRecords::Find(const char *Package,bool const &SrcOn
 /* */
 const char *pkgSrcRecords::Parser::BuildDepType(unsigned char const &Type)
 {
 /* */
 const char *pkgSrcRecords::Parser::BuildDepType(unsigned char const &Type)
 {

-   const char *fields[] = {"Build-Depends", 
-                           "Build-Depends-Indep",
+   const char *fields[] = {"Build-Depends",
+                          "Build-Depends-Indep",

                           "Build-Conflicts",
                           "Build-Conflicts-Indep"};
                           "Build-Conflicts",
                           "Build-Conflicts-Indep"};

-   if (Type < 4) 
-      return fields[Type]; 
-   else 
+   if (unlikely(Type >= sizeof(fields)/sizeof(fields[0])))

       return "";
       return "";

+   return fields[Type];

 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/