From 4fad7262291a8af1415fb9a3693678bd9610f0d6 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 24 Feb 2020 17:46:10 +0100 Subject: Make map_pointer typesafe Instead of just using uint32_t, which would allow you to assign e.g. a map_pointer to a map_pointer, use our own smarter struct that has strict type checking. We allow creating a map_pointer from a nullptr, and we allow comparing map_pointer to nullptr, which also deals with comparisons against 0 which are often used, as 0 will be implictly converted to nullptr. --- cmdline/apt-cache.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmdline') diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 2d6c1a91e..23ab7e47f 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -467,7 +467,7 @@ static bool DumpAvail(CommandLine &) char *Buffer = new char[Cache->HeaderP->MaxVerFileSize+10]; for (pkgCache::VerFile **J = VFList; *J != 0;) { - pkgCache::PkgFileIterator File(*Cache,(*J)->File + Cache->PkgFileP); + pkgCache::PkgFileIterator File(*Cache, Cache->PkgFileP + (*J)->File); // FIXME: Add support for volatile/with-source files FileFd PkgF(File.FileName(),FileFd::ReadOnly, FileFd::Extension); if (_error->PendingError() == true) @@ -481,7 +481,7 @@ static bool DumpAvail(CommandLine &) unsigned long Pos = 0; for (; *J != 0; J++) { - if ((*J)->File + Cache->PkgFileP != File) + if (Cache->PkgFileP + (*J)->File != File) break; const pkgCache::VerFile &VF = **J; -- cgit v1.2.3