From d36b06d7eb300ca5cbee22b4fcedaefc80585da1 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Wed, 26 Feb 2020 18:26:13 +0100 Subject: Fix various compiler warnings --- apt-pkg/cachefilter-patterns.h | 2 +- apt-pkg/contrib/strutl.cc | 4 ---- apt-pkg/edsp/edspsystem.h | 2 +- apt-pkg/metaindex.cc | 6 +++--- debian/libapt-pkg6.0.symbols | 1 - 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/apt-pkg/cachefilter-patterns.h b/apt-pkg/cachefilter-patterns.h index 2071c80b3..0c0dafa15 100644 --- a/apt-pkg/cachefilter-patterns.h +++ b/apt-pkg/cachefilter-patterns.h @@ -261,7 +261,7 @@ struct APT_HIDDEN PackageIsVirtual : public PackageMatcher struct APT_HIDDEN VersionAnyMatcher : public Matcher { - bool operator()(pkgCache::GrpIterator const &Grp) override { return false; } + bool operator()(pkgCache::GrpIterator const &) override { return false; } bool operator()(pkgCache::VerIterator const &Ver) override = 0; bool operator()(pkgCache::PkgIterator const &Pkg) override { diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 70befdc48..972472986 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -1044,10 +1044,6 @@ static time_t timegm(struct tm *t) we allow them here to to be able to reuse the method. Either way, a date must be in UTC or parsing will fail. Previous implementations of this method used to ignore the timezone and assume always UTC. */ -bool RFC1123StrToTime(const char* const str,time_t &time) -{ - return RFC1123StrToTime(std::string(str), time); -} bool RFC1123StrToTime(std::string const &str,time_t &time) { unsigned short day = 0; diff --git a/apt-pkg/edsp/edspsystem.h b/apt-pkg/edsp/edspsystem.h index 9e34345cd..33f06c4d5 100644 --- a/apt-pkg/edsp/edspsystem.h +++ b/apt-pkg/edsp/edspsystem.h @@ -42,7 +42,7 @@ public: std::vector ArchitecturesSupported() const override { return {}; }; bool LockInner() override { return _error->Error("LockInner is not implemented"); }; - bool UnLockInner(bool NoErrors=false) override { return _error->Error("UnLockInner is not implemented"); }; + bool UnLockInner(bool) override { return _error->Error("UnLockInner is not implemented"); }; bool IsLocked() override { return true; }; explicit edspLikeSystem(char const * const Label); diff --git a/apt-pkg/metaindex.cc b/apt-pkg/metaindex.cc index 06db06f83..fc03f3db0 100644 --- a/apt-pkg/metaindex.cc +++ b/apt-pkg/metaindex.cc @@ -131,17 +131,17 @@ void metaIndex::swapLoad(metaIndex * const OldMetaIndex) /*{{{*/ } /*}}}*/ -bool metaIndex::IsArchitectureSupported(std::string const &arch) const /*{{{*/ +bool metaIndex::IsArchitectureSupported(std::string const &) const /*{{{*/ { return true; } /*}}}*/ -bool metaIndex::IsArchitectureAllSupportedFor(IndexTarget const &target) const/*{{{*/ +bool metaIndex::IsArchitectureAllSupportedFor(IndexTarget const &) const/*{{{*/ { return true; } /*}}}*/ -bool metaIndex::HasSupportForComponent(std::string const &component) const/*{{{*/ +bool metaIndex::HasSupportForComponent(std::string const &) const/*{{{*/ { return true; } diff --git a/debian/libapt-pkg6.0.symbols b/debian/libapt-pkg6.0.symbols index fb58cfc6f..5add3bd93 100644 --- a/debian/libapt-pkg6.0.symbols +++ b/debian/libapt-pkg6.0.symbols @@ -627,7 +627,6 @@ libapt-pkg.so.6.0 libapt-pkg6.0 #MINVER# ### architecture specific: time_t (arch=!x32|c++)"FTPMDTMStrToTime(char const*, long&)@APTPKG_6.0" 0.8.0 (arch=x32|c++)"FTPMDTMStrToTime(char const*, long long&)@APTPKG_6.0" 0.8.0 - (arch=!x32|c++)"RFC1123StrToTime(char const*, long&)@APTPKG_6.0" 0.8.0 (arch=x32|c++)"RFC1123StrToTime(char const*, long long&)@APTPKG_6.0" 0.8.0 (arch=!x32|c++)"RFC1123StrToTime(std::__cxx11::basic_string, std::allocator > const&, long&)@APTPKG_6.0" 1.9.0 (arch=x32|c++)"RFC1123StrToTime(std::__cxx11::basic_string, std::allocator > const&, long long&)@APTPKG_6.0" 1.9.0 -- cgit v1.2.3