diff options
Diffstat (limited to 'apt-private')
| -rw-r--r-- | apt-private/private-search.cc | 6 | ||||
| -rw-r--r-- | apt-private/private-source.cc | 7 |
2 files changed, 4 insertions, 9 deletions
diff --git a/apt-private/private-search.cc b/apt-private/private-search.cc index b850339f9..eac7abd05 100644 --- a/apt-private/private-search.cc +++ b/apt-private/private-search.cc @@ -133,8 +133,8 @@ static bool FullTextSearch(CommandLine &CmdL) /*{{{*/ // LocalitySort - Sort a version list by package file locality /*{{{*/ static int LocalityCompare(const void * const a, const void * const b) { - pkgCache::VerFile const * const A = *(pkgCache::VerFile const * const * const)a; - pkgCache::VerFile const * const B = *(pkgCache::VerFile const * const * const)b; + pkgCache::VerFile const * const A = *static_cast<pkgCache::VerFile const * const *>(a); + pkgCache::VerFile const * const B = *static_cast<pkgCache::VerFile const * const *>(b); if (A == 0 && B == 0) return 0; @@ -164,6 +164,7 @@ struct ExDescFile pkgCache::DescFile *Df; pkgCache::VerIterator V; map_id_t ID; + ExDescFile() : Df(nullptr), ID(0) {} }; static bool Search(CommandLine &CmdL) { @@ -203,7 +204,6 @@ static bool Search(CommandLine &CmdL) size_t const descCount = Cache->HeaderP->GroupCount + 1; ExDescFile *DFList = new ExDescFile[descCount]; - memset(DFList,0,sizeof(*DFList) * descCount); bool *PatternMatch = new bool[descCount * NumPatterns]; memset(PatternMatch,false,sizeof(*PatternMatch) * descCount * NumPatterns); diff --git a/apt-private/private-source.cc b/apt-private/private-source.cc index 47610cd80..32651cfdb 100644 --- a/apt-private/private-source.cc +++ b/apt-private/private-source.cc @@ -208,12 +208,7 @@ static pkgSrcRecords::Parser *FindSrc(const char *Name, // or RelTag if (Cache.BuildPolicy() == false) return nullptr; - pkgPolicy * Policy = dynamic_cast<pkgPolicy*>(Cache.GetPolicy()); - if (Policy == nullptr) - { - _error->Fatal("Implementation error: dynamic up-casting policy engine failed in FindSrc!"); - return nullptr; - } + pkgPolicy * const Policy = Cache.GetPolicy(); pkgCache::VerIterator const Ver = Policy->GetCandidateVer(Pkg); if (Ver.end() == false) { |