fix some new compiler warnings reported by gcc-5

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

diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h
index 2bd3f3c8f901ae04594de3edf1f13844f1e8268e..38e0719403f2228ec43687e4ef425fb04c117ee9 100644 (file)
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -25,21 +25,12 @@
 #include <apt-pkg/indexfile.h>
 #endif
 
 #include <apt-pkg/indexfile.h>
 #endif
 

-class debRecordParser : public pkgRecords::Parser
+class APT_HIDDEN debRecordParserBase : public pkgRecords::Parser

 {
 {

-   /** \brief dpointer placeholder (for later in case we need it) */
-   void *d;
-   

  protected:
  protected:

-   FileFd File;
-   pkgTagFile Tags;

    pkgTagSection Section;
    pkgTagSection Section;

-   
-   virtual bool Jump(pkgCache::VerFileIterator const &Ver);
-   virtual bool Jump(pkgCache::DescFileIterator const &Desc);
-   
- public:

 
 

+ public:

    // These refer to the archive file for the Version
    virtual std::string FileName();
    virtual std::string SourcePkg();
    // These refer to the archive file for the Version
    virtual std::string FileName();
    virtual std::string SourcePkg();


@@ -58,20 +49,42 @@ class debRecordParser : public pkgRecords::Parser
    virtual std::string RecordField(const char *fieldName);
 
    virtual void GetRec(const char *&Start,const char *&Stop);
    virtual std::string RecordField(const char *fieldName);
 
    virtual void GetRec(const char *&Start,const char *&Stop);

-   
+
+   debRecordParserBase() : Parser() {}
+   virtual ~debRecordParserBase();
+};
+
+class APT_HIDDEN debRecordParser : public debRecordParserBase
+{
+ protected:
+   FileFd File;
+   pkgTagFile Tags;
+
+   virtual bool Jump(pkgCache::VerFileIterator const &Ver);
+   virtual bool Jump(pkgCache::DescFileIterator const &Desc);
+
+ public:

    debRecordParser(std::string FileName,pkgCache &Cache);
    debRecordParser(std::string FileName,pkgCache &Cache);

-   virtual ~debRecordParser() {};
+   virtual ~debRecordParser();

 };
 
 // custom record parser that reads deb files directly
 };
 
 // custom record parser that reads deb files directly

-class debDebFileRecordParser : public debRecordParser
+class APT_HIDDEN debDebFileRecordParser : public debRecordParserBase

 {
 {

+   std::string debFileName;
+   std::string controlContent;
+
+   APT_HIDDEN bool LoadContent();
+ protected:
+   // single file files, so no jumping whatsoever
+   bool Jump(pkgCache::VerFileIterator const &) { return LoadContent(); }
+   bool Jump(pkgCache::DescFileIterator const &) { return LoadContent(); }
+

  public:
  public:

-   virtual std::string FileName() {
-      return File.Name();
-   }
-   debDebFileRecordParser(std::string FileName,pkgCache &Cache)
-      : debRecordParser(FileName, Cache) {};
+   virtual std::string FileName() { return debFileName; }
+
+   debDebFileRecordParser(std::string FileName)
+      : debRecordParserBase(), debFileName(FileName) {};

 };
 
 #endif
 };
 
 #endif