From ab94ebe064bf751de73a11398b1af5589ab8c668 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 6 May 2019 22:23:45 +0200 Subject: Merge the ParseDepends functions --- apt-pkg/deb/deblistparser.h | 41 ++++++++++++----------------------------- 1 file changed, 12 insertions(+), 29 deletions(-) (limited to 'apt-pkg/deb/deblistparser.h') diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 1d731d5a9..807968452 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -77,35 +77,18 @@ class APT_HIDDEN debListParser : public pkgCacheListParser virtual bool Step() APT_OVERRIDE; - APT_PUBLIC static const char *ParseDepends(const char *Start,const char *Stop, - std::string &Package,std::string &Ver,unsigned int &Op); - APT_PUBLIC static const char *ParseDepends(const char *Start,const char *Stop, - std::string &Package,std::string &Ver,unsigned int &Op, - bool const &ParseArchFlags); - APT_PUBLIC static const char *ParseDepends(const char *Start,const char *Stop, - std::string &Package,std::string &Ver,unsigned int &Op, - bool const &ParseArchFlags, bool const &StripMultiArch); - APT_PUBLIC static const char *ParseDepends(const char *Start,const char *Stop, - std::string &Package,std::string &Ver,unsigned int &Op, - bool const &ParseArchFlags, bool const &StripMultiArch, - bool const &ParseRestrictionsList); - APT_PUBLIC static const char *ParseDepends(const char *Start,const char *Stop, - std::string &Package,std::string &Ver,unsigned int &Op, - bool const &ParseArchFlags, bool const &StripMultiArch, - bool const &ParseRestrictionsList, - 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); - APT_PUBLIC static const char *ParseDepends(const char *Start,const char *Stop, - APT::StringView &Package, - APT::StringView &Ver,unsigned int &Op, - bool const ParseArchFlags, bool StripMultiArch, - bool const ParseRestrictionsList, - std::string const &Arch); + APT_PUBLIC static const char *ParseDepends(const char *Start, const char *Stop, + std::string &Package, std::string &Ver, unsigned int &Op, + bool const &ParseArchFlags = false, bool const &StripMultiArch = true, + 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_PUBLIC static const char *ConvertRelation(const char *I,unsigned int &Op); -- cgit v1.2.3