diff options
| author | Julian Andres Klode <jak@debian.org> | 2025-01-31 08:34:37 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2025-01-31 08:34:37 +0000 |
| commit | 565d3fb1a53ef8766b947a960c07043fa021d515 (patch) | |
| tree | 1b4281ab88b28aaea1183433f02d9b7507d9910e /apt-pkg/pkgcache.h | |
| parent | 945ead2ab03b7c83b3fbaecf3e1e543525e476f0 (diff) | |
| parent | ce3794a7df13f3d7387b4e4520221421ee92127b (diff) | |
Merge branch 'fix/stats' into 'main'
`stats` rabbithole: Do not overflow ver/desc<->file relation counters
See merge request apt-team/apt!441
Diffstat (limited to 'apt-pkg/pkgcache.h')
| -rw-r--r-- | apt-pkg/pkgcache.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 476a01514..0b61b0048 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -341,8 +341,13 @@ struct pkgCache::Header map_id_t DependsDataCount; map_fileid_t ReleaseFileCount; map_fileid_t PackageFileCount; +#if APT_PKG_ABI <= 600 map_fileid_t VerFileCount; map_fileid_t DescFileCount; +#else + map_id_t VerFileCount; + map_id_t DescFileCount; +#endif map_id_t ProvidesCount; /** \brief index of the first PackageFile structure @@ -599,8 +604,9 @@ struct pkgCache::VerFile map_pointer<VerFile> NextFile; /** \brief position in the package file */ map_filesize_t Offset; // File offset - /** @TODO document pkgCache::VerFile::Size */ - map_filesize_t Size; +#if APT_PKG_ABI <= 600 + [[deprecated("No usage in src:apt, try MaxVerFileSize instead")]] map_filesize_t Size; +#endif }; /*}}}*/ // DescFile structure /*{{{*/ @@ -613,8 +619,9 @@ struct pkgCache::DescFile map_pointer<DescFile> NextFile; /** \brief position in the file */ map_filesize_t Offset; // File offset - /** @TODO document pkgCache::DescFile::Size */ - map_filesize_t Size; +#if APT_PKG_ABI <= 600 + [[deprecated("No usage in src:apt, try MaxDescFileSize instead")]] map_filesize_t Size; +#endif }; /*}}}*/ // Version structure /*{{{*/ |