From ec60f73a790ea10a592eb5f4bb96a38f3598711a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 20 Mar 2022 14:39:31 +0100 Subject: Drop unneeded usage of deprecated std::binary_function The code isn't using any of the member types this template provides, so we can just drop it from the code without any practical effect. Reported-By: gcc -Wdeprecated-declarations Gbp-Dch: Ignore --- ftparchive/apt-ftparchive.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index bbba0834b..0f6587281 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -116,19 +116,19 @@ struct PackageMap bool SrcDone; time_t ContentsMTime; - struct ContentsCompare : public binary_function + struct ContentsCompare { inline bool operator() (const PackageMap &x,const PackageMap &y) {return x.ContentsMTime < y.ContentsMTime;}; }; - struct DBCompare : public binary_function + struct DBCompare { inline bool operator() (const PackageMap &x,const PackageMap &y) {return x.BinCacheDB < y.BinCacheDB;}; }; - struct SrcDBCompare : public binary_function + struct SrcDBCompare { inline bool operator() (const PackageMap &x,const PackageMap &y) {return x.SrcCacheDB < y.SrcCacheDB;}; -- cgit v1.2.3-70-g09d2 From 136f3829940ad4bc8361085645f18795f34c905c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 31 Aug 2022 16:03:00 +0200 Subject: Avoid triggering unused parameter warning in staticSIGWINCH Reported-By: gcc -Wunused-parameter Gbp-Dch: Ignore --- apt-pkg/install-progress.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/install-progress.cc b/apt-pkg/install-progress.cc index 8a6d87cd2..c7f7573de 100644 --- a/apt-pkg/install-progress.cc +++ b/apt-pkg/install-progress.cc @@ -237,7 +237,7 @@ PackageManagerFancy::~PackageManagerFancy() signal(SIGWINCH, SIGWINCH_orig); } -void PackageManagerFancy::staticSIGWINCH(int signum) +void PackageManagerFancy::staticSIGWINCH(int /*signum*/) { SIGWINCH_flag = 1; } -- cgit v1.2.3-70-g09d2 From 896286ecf151620e5e2b88c74e8f361e04224da9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 31 Aug 2022 16:15:33 +0200 Subject: Avoid comparison of integers of different signedness for ETA Reported-By: gcc -Wsign-compare Gbp-Dch: Ignore --- apt-pkg/acquire.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index dd0624ad6..cdb2c5257 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -1470,7 +1470,8 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner) std::string msg; long i = CurrentItems < TotalItems ? CurrentItems + 1 : CurrentItems; // only show the ETA if it makes sense - if (ETA > 0 && ETA < std::chrono::seconds(std::chrono::hours(24 * 2)).count()) + auto const twodays = std::chrono::seconds(std::chrono::hours(24 * 2)).count(); + if (ETA > 0 && ETA < static_cast(twodays)) strprintf(msg, _("Retrieving file %li of %li (%s remaining)"), i, TotalItems, TimeToStr(ETA).c_str()); else strprintf(msg, _("Retrieving file %li of %li"), i, TotalItems); -- cgit v1.2.3-70-g09d2 From b7d4e96379c2a56b9222d4640618576a03e4dafd Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 29 Jan 2023 13:42:35 +0100 Subject: Include cstdint for uint16_t in our mmap wrapping In gcc-13 internal includes were reduced exposing our laziness. Reported-By: gcc-13 Gbp-Dch: Ignore --- apt-pkg/contrib/mmap.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index 642e20473..0568e1cd0 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -23,6 +23,7 @@ #include #include +#include #include #include #include -- cgit v1.2.3-70-g09d2 From 2cd6be476d1e5a5592ddac8a912ae73bc882d55e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 29 Jan 2023 13:27:24 +0100 Subject: Drop redundant 'virtual' on function marked 'override' Reported-By: clang-tidy [cppcoreguidelines-explicit-virtual-functions] Gbp-Dch: Ignore --- apt-pkg/cachefilter.h | 64 +++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/apt-pkg/cachefilter.h b/apt-pkg/cachefilter.h index ccff6f9a3..8ea8cf3da 100644 --- a/apt-pkg/cachefilter.h +++ b/apt-pkg/cachefilter.h @@ -30,35 +30,35 @@ public: class APT_PUBLIC PackageMatcher : public Matcher { public: - virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE = 0; - virtual bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE { return (*this)(Ver.ParentPkg()); } - virtual bool operator() (pkgCache::GrpIterator const &/*Grp*/) APT_OVERRIDE { return false; } - virtual ~PackageMatcher(); + bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE = 0; + bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE { return (*this)(Ver.ParentPkg()); } + bool operator() (pkgCache::GrpIterator const &/*Grp*/) APT_OVERRIDE { return false; } + ~PackageMatcher() APT_OVERRIDE; }; // Generica like True, False, NOT, AND, OR /*{{{*/ class APT_PUBLIC TrueMatcher : public Matcher { public: - virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; - virtual bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; - virtual bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE; + bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; + bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; + bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE; }; class APT_PUBLIC FalseMatcher : public Matcher { public: - virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; - virtual bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; - virtual bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE; + bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; + bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; + bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE; }; class APT_PUBLIC NOTMatcher : public Matcher { Matcher * const matcher; public: explicit NOTMatcher(Matcher * const matcher); - virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; - virtual bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; - virtual bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE; - virtual ~NOTMatcher(); + bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; + bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; + bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE; + ~NOTMatcher() APT_OVERRIDE; }; class APT_PUBLIC ANDMatcher : public Matcher { @@ -72,10 +72,10 @@ public: ANDMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3, Matcher * const matcher4); ANDMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3, Matcher * const matcher4, Matcher * const matcher5); ANDMatcher& AND(Matcher * const matcher); - virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; - virtual bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; - virtual bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE; - virtual ~ANDMatcher(); + bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; + bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; + bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE; + ~ANDMatcher() APT_OVERRIDE; }; class APT_PUBLIC ORMatcher : public Matcher { std::vector matchers; @@ -88,28 +88,28 @@ public: ORMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3, Matcher * const matcher4); ORMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3, Matcher * const matcher4, Matcher * const matcher5); ORMatcher& OR(Matcher * const matcher); - virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; - virtual bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; - virtual bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE; - virtual ~ORMatcher(); + bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; + bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; + bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE; + ~ORMatcher() APT_OVERRIDE; }; /*}}}*/ class APT_PUBLIC PackageNameMatchesRegEx : public PackageMatcher { /*{{{*/ regex_t* pattern; public: explicit PackageNameMatchesRegEx(std::string const &Pattern); - virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; - virtual bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; - virtual ~PackageNameMatchesRegEx(); + bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; + bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; + ~PackageNameMatchesRegEx() APT_OVERRIDE; }; /*}}}*/ class APT_PUBLIC PackageNameMatchesFnmatch : public PackageMatcher { /*{{{*/ const std::string Pattern; public: explicit PackageNameMatchesFnmatch(std::string const &Pattern); - virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; - virtual bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; - virtual ~PackageNameMatchesFnmatch() {}; + bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; + bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE; + ~PackageNameMatchesFnmatch() APT_OVERRIDE = default; }; /*}}}*/ class APT_PUBLIC PackageArchitectureMatchesSpecification : public PackageMatcher { /*{{{*/ @@ -134,16 +134,16 @@ public: */ PackageArchitectureMatchesSpecification(std::string const &pattern, bool const isPattern = true); bool operator() (char const * const &arch); - virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; - virtual ~PackageArchitectureMatchesSpecification(); + bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; + ~PackageArchitectureMatchesSpecification() APT_OVERRIDE; }; /*}}}*/ class APT_PUBLIC PackageIsNewInstall : public PackageMatcher { /*{{{*/ pkgCacheFile * const Cache; public: explicit PackageIsNewInstall(pkgCacheFile * const Cache); - virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; - virtual ~PackageIsNewInstall(); + bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; + ~PackageIsNewInstall() APT_OVERRIDE; }; /*}}}*/ -- cgit v1.2.3-70-g09d2 From 3c9ff866affaae10303de04f647220a16bf7e27a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 29 Jan 2023 13:44:37 +0100 Subject: Unhide virtual overloads in some cachefilters The matchers are usually called via its base class, but if we would call them via the derivate class we would not be able to call the not explicitly "imported" overloads, which would be strange. Reported-By: gcc-13 -Woverloaded-virtual Gbp-Dch: Ignore --- apt-pkg/cachefilter.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apt-pkg/cachefilter.h b/apt-pkg/cachefilter.h index 8ea8cf3da..1b5f9aa71 100644 --- a/apt-pkg/cachefilter.h +++ b/apt-pkg/cachefilter.h @@ -134,6 +134,7 @@ public: */ PackageArchitectureMatchesSpecification(std::string const &pattern, bool const isPattern = true); bool operator() (char const * const &arch); + using PackageMatcher::operator(); bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; ~PackageArchitectureMatchesSpecification() APT_OVERRIDE; }; @@ -142,6 +143,7 @@ class APT_PUBLIC PackageIsNewInstall : public PackageMatcher { /*{{{*/ pkgCacheFile * const Cache; public: explicit PackageIsNewInstall(pkgCacheFile * const Cache); + using PackageMatcher::operator(); bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; ~PackageIsNewInstall() APT_OVERRIDE; }; -- cgit v1.2.3-70-g09d2 From 0ac3afe29cfc71c657853f06961c6c8ba9c09e5c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 29 Jan 2023 13:54:02 +0100 Subject: Ignore return of .c_str() in preemptive call for signal handler Reported-By: gcc-13 -Wunused-result Gbp-Dch: Ignore --- methods/ftp.cc | 2 +- methods/http.cc | 2 +- methods/rsh.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/methods/ftp.cc b/methods/ftp.cc index 16236232a..aa0c0692c 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -1115,7 +1115,7 @@ bool FtpMethod::Fetch(FetchItem *Itm) URIStart(Res); FailFile = Itm->DestFile; - FailFile.c_str(); // Make sure we don't do a malloc in the signal handler + (void)(FailFile.c_str()); // Make sure we don't do a malloc in the signal handler FailFd = Fd.Fd(); bool Missing; diff --git a/methods/http.cc b/methods/http.cc index 2a5ab2cd2..b4519a890 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -1008,7 +1008,7 @@ BaseHttpMethod::DealWithHeadersResult HttpMethod::DealWithHeaders(FetchResult &R return ERROR_NOT_FROM_SERVER; FailFile = Queue->DestFile; - FailFile.c_str(); // Make sure we don't do a malloc in the signal handler + (void)(FailFile.c_str()); // Make sure we don't do a malloc in the signal handler FailFd = Req.File.Fd(); FailTime = Req.Date; diff --git a/methods/rsh.cc b/methods/rsh.cc index 09d72cbc5..68407b062 100644 --- a/methods/rsh.cc +++ b/methods/rsh.cc @@ -501,7 +501,7 @@ bool RSHMethod::Fetch(FetchItem *Itm) URIStart(Res); FailFile = Itm->DestFile; - FailFile.c_str(); // Make sure we don't do a malloc in the signal handler + (void)(FailFile.c_str()); // Make sure we don't do a malloc in the signal handler FailFd = Fd.Fd(); bool Missing; -- cgit v1.2.3-70-g09d2