Rework pkgAcqMeta{Index,Sig,ClearSig}::Done() for readability

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

diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc
index a5dab22ffd57f5bce52158f5562ffc528caefc83..859af3a0921a0bc58d1d663c3f0fbaaf5a2fa9a3 100644 (file)
--- a/apt-pkg/pkgrecords.cc
+++ b/apt-pkg/pkgrecords.cc
@@ -9,22 +9,28 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include<config.h>
+

 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/error.h>

-#include <apt-pkg/configuration.h>
-    
-#include <apti18n.h>   
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+
+#include <stddef.h>
+#include <vector>
+
+#include <apti18n.h>

                                                                        /*}}}*/
 
 // Records::pkgRecords - Constructor                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* This will create the necessary structures to access the status files */
                                                                        /*}}}*/
 
 // Records::pkgRecords - Constructor                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* This will create the necessary structures to access the status files */

-pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), 
+pkgRecords::pkgRecords(pkgCache &aCache) : d(NULL), Cache(aCache),

   Files(Cache.HeaderP->PackageFileCount)
 {
   Files(Cache.HeaderP->PackageFileCount)
 {

-   for (pkgCache::PkgFileIterator I = Cache.FileBegin(); 
-       I.end() == false; I++)
+   for (pkgCache::PkgFileIterator I = Cache.FileBegin();
+        I.end() == false; ++I)

    {
       const pkgIndexFile::Type *Type = pkgIndexFile::Type::GetType(I.IndexType());
       if (Type == 0)
    {
       const pkgIndexFile::Type *Type = pkgIndexFile::Type::GetType(I.IndexType());
       if (Type == 0)


@@ -44,7 +50,7 @@ pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache),
 /* */
 pkgRecords::~pkgRecords()
 {
 /* */
 pkgRecords::~pkgRecords()
 {

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

      it != Files.end();
      ++it)
    {
      it != Files.end();
      ++it)
    {