drop confusing comma from no strong hash message

[apt.git] / apt-pkg / deb / deblistparser.h

diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index 4bc3c23415b8c77429c0c3dea1e2795c91139f77..a78312f9d6e07283223aa7962b9330963800b110 100644 (file)
--- a/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@ -19,6 +19,9 @@
 
 #include <string>
 #include <vector>
+#ifdef APT_PKG_EXPOSE_STRING_VIEW
+#include <apt-pkg/string_view.h>
+#endif
 
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/indexfile.h>
@@ -26,16 +29,18 @@
 
 class FileFd;
 
-class APT_HIDDEN debListParser : public pkgCacheGenerator::ListParser
+class APT_HIDDEN debListParser : public pkgCacheListParser
 {
    public:
 
+#ifdef APT_PKG_EXPOSE_STRING_VIEW
    // Parser Helper
    struct WordList
    {
-      const char *Str;
+      APT::StringView Str;
       unsigned char Val;
    };
+#endif
 
    private:
    /** \brief dpointer placeholder (for later in case we need it) */
@@ -45,16 +50,17 @@ class APT_HIDDEN debListParser : public pkgCacheGenerator::ListParser
    pkgTagFile Tags;
    pkgTagSection Section;
    map_filesize_t iOffset;
-   std::string Arch;
-   std::vector<std::string> Architectures;
-   bool MultiArchEnabled;
 
    virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver);
-   bool ParseDepends(pkgCache::VerIterator &Ver,const char *Tag,
+#ifdef APT_PKG_EXPOSE_STRING_VIEW
+   bool ParseDepends(pkgCache::VerIterator &Ver, APT::StringView Tag,
                     unsigned int Type);
+#endif
    bool ParseProvides(pkgCache::VerIterator &Ver);
-   bool NewProvidesAllArch(pkgCache::VerIterator &Ver, std::string const &Package, std::string const &Version);
-   static bool GrabWord(std::string Word,WordList *List,unsigned char &Out);
+
+#ifdef APT_PKG_EXPOSE_STRING_VIEW
+   APT_HIDDEN static bool GrabWord(APT::StringView Word,const WordList *List,unsigned char &Out);
+#endif
    APT_HIDDEN unsigned char ParseMultiArch(bool const showErrors);
 
    public:
@@ -63,17 +69,16 @@ class APT_HIDDEN debListParser : public pkgCacheGenerator::ListParser
       
    // These all operate against the current section
    virtual std::string Package() APT_OVERRIDE;
-   virtual std::string Architecture() APT_OVERRIDE;
    virtual bool ArchitectureAll() APT_OVERRIDE;
-   virtual std::string Version() APT_OVERRIDE;
+#ifdef APT_PKG_EXPOSE_STRING_VIEW
+   virtual APT::StringView Architecture() APT_OVERRIDE;
+   virtual APT::StringView Version() APT_OVERRIDE;
+#endif
    virtual bool NewVersion(pkgCache::VerIterator &Ver) APT_OVERRIDE;
-   virtual std::string Description(std::string const &lang) APT_OVERRIDE;
    virtual std::vector<std::string> AvailableDescriptionLanguages() APT_OVERRIDE;
    virtual MD5SumValue Description_md5() APT_OVERRIDE;
    virtual unsigned short VersionHash() APT_OVERRIDE;
-#if APT_PKG_ABI >= 413
    virtual bool SameVersion(unsigned short const Hash, pkgCache::VerIterator const &Ver) APT_OVERRIDE;
-#endif
    virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
                           pkgCache::VerIterator &Ver) APT_OVERRIDE;
    virtual map_filesize_t Offset() APT_OVERRIDE {return iOffset;};
@@ -97,9 +102,17 @@ class APT_HIDDEN debListParser : public pkgCacheGenerator::ListParser
         bool const &ParseArchFlags, bool const &StripMultiArch,
         bool const &ParseRestrictionsList);
 
+#ifdef APT_PKG_EXPOSE_STRING_VIEW
+   APT_HIDDEN 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);
+#endif
+
    APT_PUBLIC static const char *ConvertRelation(const char *I,unsigned int &Op);
 
-   debListParser(FileFd *File, std::string const &Arch = "");
+   debListParser(FileFd *File);
    virtual ~debListParser();
 };
 
@@ -117,12 +130,21 @@ class APT_HIDDEN debDebFileParser : public debListParser
 class APT_HIDDEN debTranslationsParser : public debListParser
 {
  public:
+#ifdef APT_PKG_EXPOSE_STRING_VIEW
    // a translation can never be a real package
-   virtual std::string Architecture() APT_OVERRIDE { return ""; }
-   virtual std::string Version() APT_OVERRIDE { return ""; }
+   virtual APT::StringView Architecture() APT_OVERRIDE { return ""; }
+   virtual APT::StringView Version() APT_OVERRIDE { return ""; }
+#endif
 
-   debTranslationsParser(FileFd *File, std::string const &Arch = "")
-      : debListParser(File, Arch) {};
+   debTranslationsParser(FileFd *File)
+      : debListParser(File) {};
 };
 
+class APT_HIDDEN debStatusListParser : public debListParser
+{
+ public:
+   virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver);
+   debStatusListParser(FileFd *File)
+      : debListParser(File) {};
+};
 #endif