projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ABI-Break] remove the PACKAGE_MATCHER_ABI_COMPAT defines
[apt.git]
/
apt-pkg
/
pkgrecords.cc
diff --git
a/apt-pkg/pkgrecords.cc
b/apt-pkg/pkgrecords.cc
index b22f3e73fc80ccf6ffe2943529f17aaa30561102..36dab3480d684cc87fef656ad46b15bd83bd04b4 100644
(file)
--- a/
apt-pkg/pkgrecords.cc
+++ b/
apt-pkg/pkgrecords.cc
@@
-9,39
+9,36
@@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/pkgrecords.h"
-#endif
+#include<config.h>
+
#include <apt-pkg/pkgrecords.h>
#include <apt-pkg/indexfile.h>
#include <apt-pkg/error.h>
#include <apt-pkg/configuration.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 <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), Files(0)
+pkgRecords::pkgRecords(pkgCache &Cache) : d(NULL), Cache(Cache),
+ Files(Cache.HeaderP->PackageFileCount)
{
{
- Files = new Parser *[Cache.HeaderP->PackageFileCount];
- memset(Files,0,sizeof(*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)
{
- _error->Error(_("Index file type '%s' is not supported"),I.IndexType());
- return;
+
_error->Error(_("Index file type '%s' is not supported"),I.IndexType());
+
return;
}
Files[I->ID] = Type->CreatePkgParser(I);
if (Files[I->ID] == 0)
}
Files[I->ID] = Type->CreatePkgParser(I);
if (Files[I->ID] == 0)
- return;
- }
+
return;
+ }
}
/*}}}*/
// Records::~pkgRecords - Destructor /*{{{*/
}
/*}}}*/
// Records::~pkgRecords - Destructor /*{{{*/
@@
-49,9
+46,12
@@
pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0)
/* */
pkgRecords::~pkgRecords()
{
/* */
pkgRecords::~pkgRecords()
{
- for (unsigned I = 0; I != Cache.HeaderP->PackageFileCount; I++)
- delete Files[I];
- delete [] Files;
+ for ( std::vector<Parser*>::iterator it = Files.begin();
+ it != Files.end();
+ ++it)
+ {
+ delete *it;
+ }
}
/*}}}*/
// Records::Lookup - Get a parser for the package version file /*{{{*/
}
/*}}}*/
// Records::Lookup - Get a parser for the package version file /*{{{*/