* merged with mainline

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

diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc
index f62f945b5b03cb8c14e9072bb6901498ca37ef91..9c2655d6a774a3b452707f2f5958ec972fc3d7ed 100644 (file)
--- a/apt-pkg/pkgrecords.cc
+++ b/apt-pkg/pkgrecords.cc
@@ -42,9 +42,6 @@ pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0)
       if (Files[I->ID] == 0)
         return;
    }   
-   // We store that to make sure that the destructor won't segfault,
-   // even if the Cache object was destructed before this instance.
-   PackageFileCount = Cache.HeaderP->PackageFileCount;
 }
                                                                        /*}}}*/
 // Records::~pkgRecords - Destructor                                   /*{{{*/
@@ -52,7 +49,7 @@ pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0)
 /* */
 pkgRecords::~pkgRecords()
 {
-   for (unsigned I = 0; I != PackageFileCount; I++)
+   for (unsigned I = 0; I != Cache.HeaderP->PackageFileCount; I++)
       delete Files[I];
    delete [] Files;
 }
@@ -66,12 +63,3 @@ pkgRecords::Parser &pkgRecords::Lookup(pkgCache::VerFileIterator const &Ver)
    return *Files[Ver.File()->ID];
 }
                                                                        /*}}}*/
-// Records::Lookup - Get a parser for the package description file     /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-pkgRecords::Parser &pkgRecords::Lookup(pkgCache::DescFileIterator const &Desc)
-{
-   Files[Desc.File()->ID]->Jump(Desc);
-   return *Files[Desc.File()->ID];
-}
-                                                                       /*}}}*/