Merge EDSP 0.5 w/ multi-arch support for external solvers

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

diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc
index 8c1de2ea5da1a3e7d25860713c3b803b5a5fe949..775cf2e5f98dcc21a0eab761ed66d945ea7828cd 100644 (file)
--- a/apt-pkg/srcrecords.cc
+++ b/apt-pkg/srcrecords.cc
@@ -16,7 +16,13 @@
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/sourcelist.h>

-#include <apt-pkg/strutl.h>
+#include <apt-pkg/metaindex.h>
+#include <apt-pkg/indexfile.h>
+#include <apt-pkg/macros.h>
+
+#include <string.h>
+#include <string>
+#include <vector>

 
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/


@@ -24,12 +30,12 @@
 // 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();
+      std::vector<pkgIndexFile *> *Indexes = (*I)->GetIndexFiles();
+      for (std::vector<pkgIndexFile *>::const_iterator J = Indexes->begin();

           J != Indexes->end(); ++J)
       {
          Parser* P = (*J)->CreateSrcParser();
           J != Indexes->end(); ++J)
       {
          Parser* P = (*J)->CreateSrcParser();


@@ -41,7 +47,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"));


@@ -57,7 +63,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;
 }
                                                                        /*}}}*/


@@ -67,10 +73,11 @@ pkgSrcRecords::~pkgSrcRecords()
 bool pkgSrcRecords::Restart()
 {
    Current = Files.begin();
 bool pkgSrcRecords::Restart()
 {
    Current = Files.begin();

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

         I != Files.end(); ++I)
         I != Files.end(); ++I)

-      (*I)->Restart();
-   
+      if ((*I)->Offset() != 0)
+        (*I)->Restart();
+

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -120,14 +127,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];

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