summaryrefslogtreecommitdiff
path: root/apt-pkg/deb
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2024-11-28 09:03:02 +0100
committerJulian Andres Klode <jak@debian.org>2024-11-28 09:03:02 +0100
commitedf03432568598dec12dfd242e6a4ed03a881693 (patch)
treee309ef9c0b693e997baf4679d0af88cf584111a6 /apt-pkg/deb
parentd4f64227803185a1eeaf92392820b684d7a11753 (diff)
Fix accidental ABI break in debListParser::ParseDepends
The version that accepted APT::StringView was marked public.
Diffstat (limited to 'apt-pkg/deb')
-rw-r--r--apt-pkg/deb/deblistparser.cc18
-rw-r--r--apt-pkg/deb/deblistparser.h7
2 files changed, 25 insertions, 0 deletions
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
@@ -82,6 +82,13 @@ class APT_HIDDEN debListParser : public pkgCacheListParser
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,
bool const ParseArchFlags = false, bool StripMultiArch = true,