warning: type qualifiers ignored on function return type [-Wignored-qualifiers]

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

diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h
index a3b5a8286a7d6089ab85f552252436d665faae3b..a8fb465bb1e8e564f423e3bb27ea3690971a0137 100644 (file)
--- a/apt-pkg/deb/debsrcrecords.h
+++ b/apt-pkg/deb/debsrcrecords.h
@@ -18,39 +18,41 @@
 
 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;

-   char *StaticBinList[400];
+   std::vector<const char*> StaticBinList;

    unsigned long iOffset;
    char *Buffer;
    unsigned long iOffset;
    char *Buffer;

-   unsigned int BufSize;

    
    public:
 
    
    public:
 

-   virtual bool Restart() {return Tags.Jump(Sect,0);};
+   virtual bool Restart() {return Jump(0);};

    virtual bool Step() {iOffset = Tags.Offset(); return Tags.Step(Sect);};
    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 std::string Package() const {return Sect.FindS("Package");};
+   virtual std::string Version() const {return Sect.FindS("Version");};
+   virtual std::string Maintainer() const {return Sect.FindS("Maintainer");};
+   virtual std::string Section() const {return Sect.FindS("Section");};

    virtual const char **Binaries();
    virtual const char **Binaries();

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

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

-   virtual string AsStr() 
+   virtual std::string AsStr() 

    {
       const char *Start=0,*Stop=0;
       Sect.GetSection(Start,Stop);
    {
       const char *Start=0,*Stop=0;
       Sect.GetSection(Start,Stop);

-      return string(Start,Stop);
+      return std::string(Start,Stop);

    };
    };

-   virtual bool Files(vector<pkgSrcRecords::File> &F);
+   virtual bool Files(std::vector<pkgSrcRecords::File> &F);

 
 

-   debSrcRecordParser(string File,pkgIndexFile const *Index) 
-      : Parser(Index), Fd(File,FileFd::ReadOnly), Tags(&Fd,102400), 
-        Buffer(0), BufSize(0) {}
-   ~debSrcRecordParser();
+   debSrcRecordParser(std::string const &File,pkgIndexFile const *Index) 
+      : Parser(Index), Fd(File,FileFd::ReadOnly, FileFd::Extension), Tags(&Fd,102400),
+        iOffset(0), Buffer(NULL) {}
+   virtual ~debSrcRecordParser();

 };
 
 #endif
 };
 
 #endif