From e217a3a425ba72e8b6ce395e1ecd411fbe58e916 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 26 Feb 2019 11:59:38 +0100 Subject: pkgSrcRecords::Parser: Fold Files2() into Files() This is possible now with the API break. Cleaner code, woohoo. --- apt-private/private-source.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apt-private') diff --git a/apt-private/private-source.cc b/apt-private/private-source.cc index c8a48a74a..48c9d8094 100644 --- a/apt-private/private-source.cc +++ b/apt-private/private-source.cc @@ -383,14 +383,14 @@ bool DoSource(CommandLine &CmdL) } // Back track - std::vector Lst; - if (Last->Files2(Lst) == false) { + std::vector Lst; + if (Last->Files(Lst) == false) { return false; } DscFile curDsc; // Load them into the fetcher - for (std::vector::const_iterator I = Lst.begin(); + for (std::vector::const_iterator I = Lst.begin(); I != Lst.end(); ++I) { // Try to guess what sort of file it is we are getting. -- cgit v1.2.3 From eba6aa6b49bf23d1ece40389b3d2959f5d125f50 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 26 Feb 2019 12:04:55 +0100 Subject: clean: Fold pkgArchiveCleaner2 into pkgArchiveCleaner --- apt-private/private-download.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apt-private') diff --git a/apt-private/private-download.cc b/apt-private/private-download.cc index 2c12676ea..16d11255b 100644 --- a/apt-private/private-download.cc +++ b/apt-private/private-download.cc @@ -339,7 +339,7 @@ bool DoClean(CommandLine &) // --------------------------------------------------------------------- /* This is similar to clean but it only purges things that cannot be downloaded, that is old versions of cached packages. */ - class LogCleaner : public pkgArchiveCleaner2 + class LogCleaner : public pkgArchiveCleaner { protected: virtual void Erase(int const dirfd, char const * const File, std::string const &Pkg, std::string const &Ver,struct stat const &St) APT_OVERRIDE -- cgit v1.2.3 From 91e1f7d49830289d8e9d3fdd7ebbe7544a9838b8 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 26 Feb 2019 12:42:42 +0100 Subject: acquire: Fold pkgAcquireStatus2 into pkgAcquireStatus Clean up the code, make it neat, lalala --- apt-private/acqprogress.cc | 6 +++--- apt-private/acqprogress.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'apt-private') diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc index a788ec98b..6cf200f5b 100644 --- a/apt-private/acqprogress.cc +++ b/apt-private/acqprogress.cc @@ -33,7 +33,7 @@ // --------------------------------------------------------------------- /* */ AcqTextStatus::AcqTextStatus(std::ostream &out, unsigned int &ScreenWidth,unsigned int const Quiet) : - pkgAcquireStatus2(), out(out), ScreenWidth(ScreenWidth), LastLineLength(0), ID(0), Quiet(Quiet) + pkgAcquireStatus(), out(out), ScreenWidth(ScreenWidth), LastLineLength(0), ID(0), Quiet(Quiet) { // testcases use it to disable pulses without disabling other user messages if (Quiet == 0 && _config->FindB("quiet::NoUpdate", false) == true) @@ -335,10 +335,10 @@ bool AcqTextStatus::ReleaseInfoChanges(metaIndex const * const L, metaIndex cons { if (Quiet >= 2 || isatty(STDOUT_FILENO) != 1 || isatty(STDIN_FILENO) != 1 || _config->FindB("APT::Get::Update::InteractiveReleaseInfoChanges", false) == false) - return pkgAcquireStatus2::ReleaseInfoChanges(nullptr, nullptr, std::move(Changes)); + return pkgAcquireStatus::ReleaseInfoChanges(nullptr, nullptr, std::move(Changes)); _error->PushToStack(); - auto const confirmed = pkgAcquireStatus2::ReleaseInfoChanges(L, N, std::move(Changes)); + auto const confirmed = pkgAcquireStatus::ReleaseInfoChanges(L, N, std::move(Changes)); if (confirmed == true) { _error->MergeWithStack(); diff --git a/apt-private/acqprogress.h b/apt-private/acqprogress.h index c8c211689..87b957e4b 100644 --- a/apt-private/acqprogress.h +++ b/apt-private/acqprogress.h @@ -15,7 +15,7 @@ #include #include -class APT_PUBLIC AcqTextStatus : public pkgAcquireStatus2 +class APT_PUBLIC AcqTextStatus : public pkgAcquireStatus { std::ostream &out; unsigned int &ScreenWidth; -- cgit v1.2.3 From 29465ea9555a453ca733280955505de8bfcce935 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 26 Feb 2019 13:21:07 +0100 Subject: sptr: Remove deprecated smart pointer classes Please use the standard C++ variants instead. --- apt-private/private-install.cc | 1 - 1 file changed, 1 deletion(-) (limited to 'apt-private') diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc index 40543d995..a5a88c99d 100644 --- a/apt-private/private-install.cc +++ b/apt-private/private-install.cc @@ -18,7 +18,6 @@ #include #include #include -#include #include #include -- cgit v1.2.3 From 476d999847adf35ec35fd9c9b9233ac8b8aa1a17 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 26 Feb 2019 13:54:32 +0100 Subject: apt-private: Remove unused InitLocale() variant --- apt-private/private-main.cc | 1 - apt-private/private-main.h | 1 - 2 files changed, 2 deletions(-) (limited to 'apt-private') diff --git a/apt-private/private-main.cc b/apt-private/private-main.cc index 47b1a0921..e9f65bd83 100644 --- a/apt-private/private-main.cc +++ b/apt-private/private-main.cc @@ -44,7 +44,6 @@ void InitLocale(APT_CMD const binary) /*{{{*/ break; } } -void InitLocale() {} /*}}}*/ void InitSignals() /*{{{*/ { diff --git a/apt-private/private-main.h b/apt-private/private-main.h index 0d60797ed..4dcb2716a 100644 --- a/apt-private/private-main.h +++ b/apt-private/private-main.h @@ -8,7 +8,6 @@ class CommandLine; void InitLocale(APT_CMD const binary); -APT_PUBLIC APT_DEPRECATED_MSG("Is a no-op now") void InitLocale(); APT_PUBLIC void InitSignals(); APT_PUBLIC void CheckIfSimulateMode(CommandLine &CmdL); APT_PUBLIC void CheckIfCalledByScript(int argc, const char *argv[]); -- cgit v1.2.3