From edf03432568598dec12dfd242e6a4ed03a881693 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 28 Nov 2024 09:03:02 +0100 Subject: Fix accidental ABI break in debListParser::ParseDepends The version that accepted APT::StringView was marked public. --- apt-pkg/deb/deblistparser.cc | 18 ++++++++++++++++++ apt-pkg/deb/deblistparser.h | 7 +++++++ 2 files changed, 25 insertions(+) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index c9e31c645..f43060394 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -563,6 +563,24 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop, return res; } +const char *debListParser::ParseDepends(const char *Start,const char *Stop, + APT::StringView &Package,APT::StringView &Ver, + unsigned int &Op, bool ParseArchFlags, + bool const StripMultiArch, + bool const ParseRestrictionsList, + string Arch) +{ + string_view PackageView; + string_view VerView; + + auto res = ParseDepends(Start, Stop, PackageView, VerView, Op, (bool)ParseArchFlags, + (bool) StripMultiArch, (bool) ParseRestrictionsList, Arch); + Package = PackageView; + Ver = VerView; + + return res; +} + const char *debListParser::ParseDepends(const char *Start, const char *Stop, string_view &Package, string_view &Ver, diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 06d3715a4..aa39bada2 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -81,6 +81,13 @@ class APT_HIDDEN debListParser : public pkgCacheListParser bool const &ParseRestrictionsList = false, std::string const &Arch = ""); + APT_PUBLIC static const char *ParseDepends(const char *Start, const char *Stop, + APT::StringView &Package, + APT::StringView &Ver, unsigned int &Op, + bool const ParseArchFlags = false, bool StripMultiArch = true, + bool const ParseRestrictionsList = false, + std::string Arch = "") APT_DEPRECATED_MSG("Use std::string_view variant instead"); + APT_PUBLIC static const char *ParseDepends(const char *Start, const char *Stop, std::string_view &Package, std::string_view &Ver, unsigned int &Op, -- cgit v1.2.3-70-g09d2