diff options
| author | Michael Vogt <mvo@debian.org> | 2005-10-22 21:57:07 +0000 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2005-10-22 21:57:07 +0000 |
| commit | ba130675088a7e10365ef932c0c0b548bd2586ad (patch) | |
| tree | 7fcb1d85da545c2a634b75efc4b392a7469f3821 /apt-pkg | |
| parent | 5892add65ba0088429351c296990a7b37b02a8dd (diff) | |
| parent | 849eef0c94ee30fd6e0fb38f54ed308a6b138a5c (diff) | |
* merge with apt--mvo--0
Patches applied:
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-78
* fix a incorrect example
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-79
* revert patch from patch-59, causes all sorts of trouble
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-80
* fix changelog
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/pkgrecords.cc | 5 | ||||
| -rw-r--r-- | apt-pkg/pkgrecords.h | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc index 1d71d3e2f..9c2655d6a 100644 --- 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; } diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h index f31e83afe..08f004414 100644 --- a/apt-pkg/pkgrecords.h +++ b/apt-pkg/pkgrecords.h @@ -33,7 +33,6 @@ class pkgRecords pkgCache &Cache; Parser **Files; - int PackageFileCount; public: |