Only check for valid Date if checking Valid-Until.

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

diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index 4663c011962e453817797117d5117f9bbdfa9857..840b48b8d6f99c170ff6fcfca3b54e7e6c449e5a 100644 (file)
--- a/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@ -43,8 +43,9 @@ class APT_HIDDEN debListParser : public pkgCacheListParser
 #endif
 
    private:
 #endif
 
    private:

-   /** \brief dpointer placeholder (for later in case we need it) */
-   void * const d;
+   std::vector<std::string> forceEssential;
+   std::vector<std::string> forceImportant;
+   std::string MD5Buffer;

 
    protected:
    pkgTagFile Tags;
 
    protected:
    pkgTagFile Tags;


@@ -52,11 +53,10 @@ class APT_HIDDEN debListParser : public pkgCacheListParser
    map_filesize_t iOffset;
 
    virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver);
    map_filesize_t iOffset;
 
    virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver);

-#ifdef APT_PKG_EXPOSE_STRING_VIEW
-   bool ParseDepends(pkgCache::VerIterator &Ver, APT::StringView Tag,
+   bool ParseDepends(pkgCache::VerIterator &Ver, pkgTagSection::Key Key,

                     unsigned int Type);
                     unsigned int Type);

-#endif

    bool ParseProvides(pkgCache::VerIterator &Ver);
    bool ParseProvides(pkgCache::VerIterator &Ver);

+   bool ParseTag(pkgCache::VerIterator &Ver);

 
 #ifdef APT_PKG_EXPOSE_STRING_VIEW
    APT_HIDDEN static bool GrabWord(APT::StringView Word,const 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);


@@ -69,16 +69,16 @@ class APT_HIDDEN debListParser : public pkgCacheListParser
       
    // These all operate against the current section
    virtual std::string Package() APT_OVERRIDE;
       
    // 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 bool ArchitectureAll() APT_OVERRIDE;

-   virtual std::string Version() APT_OVERRIDE;
-   virtual bool NewVersion(pkgCache::VerIterator &Ver) APT_OVERRIDE;
-   virtual std::string Description(std::string const &lang) APT_OVERRIDE;

 #ifdef APT_PKG_EXPOSE_STRING_VIEW
 #ifdef APT_PKG_EXPOSE_STRING_VIEW

-   APT::StringView Description(APT::StringView lang);
+   virtual APT::StringView Architecture() APT_OVERRIDE;
+   virtual APT::StringView Version() APT_OVERRIDE;

 #endif
 #endif

+   virtual bool NewVersion(pkgCache::VerIterator &Ver) APT_OVERRIDE;

    virtual std::vector<std::string> AvailableDescriptionLanguages() APT_OVERRIDE;
    virtual std::vector<std::string> AvailableDescriptionLanguages() APT_OVERRIDE;

-   virtual MD5SumValue Description_md5() APT_OVERRIDE;
+#ifdef APT_PKG_EXPOSE_STRING_VIEW
+   virtual APT::StringView Description_md5() APT_OVERRIDE;
+#endif

    virtual unsigned short VersionHash() APT_OVERRIDE;
    virtual bool SameVersion(unsigned short const Hash, pkgCache::VerIterator const &Ver) APT_OVERRIDE;
    virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
    virtual unsigned short VersionHash() APT_OVERRIDE;
    virtual bool SameVersion(unsigned short const Hash, pkgCache::VerIterator const &Ver) APT_OVERRIDE;
    virtual bool UsePackage(pkgCache::PkgIterator &Pkg,


@@ -132,9 +132,11 @@ class APT_HIDDEN debDebFileParser : public debListParser
 class APT_HIDDEN debTranslationsParser : public debListParser
 {
  public:
 class APT_HIDDEN debTranslationsParser : public debListParser
 {
  public:

+#ifdef APT_PKG_EXPOSE_STRING_VIEW

    // a translation can never be a real package
    // 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)
       : debListParser(File) {};
 
    debTranslationsParser(FileFd *File)
       : debListParser(File) {};