apt-pkg/deb/*: add placeholder dpointer and make destructors virtual

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

diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h
index 8b1237ccdc6686a9efb359ce5a391acb95b31de5..aa859b0e6378f088b4200637be5ff2245107192c 100644 (file)
--- a/apt-pkg/deb/debsrcrecords.h
+++ b/apt-pkg/deb/debsrcrecords.h
@@ -18,6 +18,9 @@
 
 class debSrcRecordParser : public pkgSrcRecords::Parser
 {
 
 class debSrcRecordParser : public pkgSrcRecords::Parser
 {

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

    FileFd Fd;
    pkgTagFile Tags;
    pkgTagSection Sect;
    FileFd Fd;
    pkgTagFile Tags;
    pkgTagSection Sect;


@@ -30,14 +33,14 @@ class debSrcRecordParser : public pkgSrcRecords::Parser
 
    virtual bool Restart() {return Tags.Jump(Sect,0);};
    virtual bool Step() {iOffset = Tags.Offset(); return Tags.Step(Sect);};
 
    virtual bool Restart() {return Tags.Jump(Sect,0);};
    virtual bool Step() {iOffset = Tags.Offset(); return Tags.Step(Sect);};

-   virtual bool Jump(unsigned long Off) {iOffset = Off; return Tags.Jump(Sect,Off);};
+   virtual bool Jump(unsigned long const &Off) {iOffset = Off; return Tags.Jump(Sect,Off);};

 
    virtual string Package() const {return Sect.FindS("Package");};
    virtual string Version() const {return Sect.FindS("Version");};
    virtual string Maintainer() const {return Sect.FindS("Maintainer");};
    virtual string Section() const {return Sect.FindS("Section");};
    virtual const char **Binaries();
 
    virtual string Package() const {return Sect.FindS("Package");};
    virtual string Version() const {return Sect.FindS("Version");};
    virtual string Maintainer() const {return Sect.FindS("Maintainer");};
    virtual string Section() const {return Sect.FindS("Section");};
    virtual const char **Binaries();

-   virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps, bool ArchOnly);
+   virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true);

    virtual unsigned long Offset() {return iOffset;};
    virtual string AsStr() 
    {
    virtual unsigned long Offset() {return iOffset;};
    virtual string AsStr() 
    {


@@ -47,9 +50,10 @@ class debSrcRecordParser : public pkgSrcRecords::Parser
    };
    virtual bool Files(vector<pkgSrcRecords::File> &F);
 
    };
    virtual bool Files(vector<pkgSrcRecords::File> &F);
 

-   debSrcRecordParser(string File,pkgIndexFile const *Index) 
-      : Parser(Index), Fd(File,FileFd::ReadOnly), Tags(&Fd,102400), 
+   debSrcRecordParser(string const &File,pkgIndexFile const *Index) 
+      : Parser(Index), Fd(File,FileFd::ReadOnlyGzip), Tags(&Fd,102400), 

         Buffer(0), BufSize(0) {}
         Buffer(0), BufSize(0) {}

+   virtual ~debSrcRecordParser();

 };
 
 #endif
 };
 
 #endif