diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2017-12-13 23:54:38 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2017-12-13 23:54:38 +0100 |
| commit | 99813a2eaa7c0cce1d7d8c811827733ed66458de (patch) | |
| tree | 61fe422eeca8c5bd5cb2de6060f11e71343d4602 /apt-pkg/deb | |
| parent | d30b30ad1e1ce434df84e15e2573c43ac152f9e3 (diff) | |
| parent | 0b5e329a8ba2461ccb7017d3adfc972f9dccd830 (diff) | |
Merge branch 'feature/happy-gcc'
Fixing various real and imagined bugs reported by gcc warnings
Diffstat (limited to 'apt-pkg/deb')
| -rw-r--r-- | apt-pkg/deb/deblistparser.cc | 6 | ||||
| -rw-r--r-- | apt-pkg/deb/debmetaindex.cc | 6 | ||||
| -rw-r--r-- | apt-pkg/deb/debsrcrecords.cc | 6 | ||||
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 2 |
4 files changed, 14 insertions, 6 deletions
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 378988a1c..241313ff2 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -170,15 +170,15 @@ bool debListParser::NewVersion(pkgCache::VerIterator &Ver) Ver->SourceVerStr = Ver->VerStr; if (Section.Find(pkgTagSection::Key::Source,Start,Stop) == true) { - const char * const Space = (const char * const) memchr(Start, ' ', Stop - Start); + const char * const Space = static_cast<const char *>(memchr(Start, ' ', Stop - Start)); pkgCache::VerIterator V; if (Space != NULL) { - const char * const Open = (const char * const) memchr(Space, '(', Stop - Space); + const char * const Open = static_cast<const char *>(memchr(Space, '(', Stop - Space)); if (likely(Open != NULL)) { - const char * const Close = (const char * const) memchr(Open, ')', Stop - Open); + const char * const Close = static_cast<const char *>(memchr(Open, ')', Stop - Open)); if (likely(Close != NULL)) { APT::StringView const version(Open + 1, (Close - Open) - 1); diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index c2579e12d..ad27e2dcd 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -459,8 +459,10 @@ bool debReleaseIndex::Load(std::string const &Filename, std::string * const Erro Sum->MetaKeyFilename = Name; Sum->Size = Size; Sum->Hashes.FileSize(Size); - APT_IGNORE_DEPRECATED(Sum->Hash = hs;) - Entries[Name] = Sum; + APT_IGNORE_DEPRECATED_PUSH + Sum->Hash = hs; + APT_IGNORE_DEPRECATED_POP + Entries[Name] = Sum; } Entries[Name]->Hashes.push_back(hs); FoundHashSum = true; diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index 1cabfe281..7fd206ed6 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -241,7 +241,11 @@ bool debSrcRecordParser::Files2(std::vector<pkgSrcRecords::File2> &List) if (file != List.end()) { if (checksumField == "Files") - APT_IGNORE_DEPRECATED(file->MD5Hash = hash;) + { + APT_IGNORE_DEPRECATED_PUSH + file->MD5Hash = hash; + APT_IGNORE_DEPRECATED_POP + } // an error here indicates that we have two different hashes for the same file if (file->Hashes.push_back(hashString) == false) return _error->Error("Error parsing checksum in %s of source package %s", checksumField.c_str(), Package().c_str()); diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 4724f6e1c..c6d0a50f1 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1758,7 +1758,9 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) case Item::Purge: ADDARGC("--force-depends"); if (std::any_of(I, J, ItemIsEssential)) + { ADDARGC("--force-remove-essential"); + } ADDARGC("--remove"); break; |