fix -Wmissing-field-initializers warnings

[apt.git] / apt-pkg / pkgrecords.h

diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h
index c2c98188a7e12fce76b512c767e56f1c9b256c21..3658435e85cd688768970d3d245c8a560f8b2379 100644 (file)
--- a/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@ -19,7 +19,6 @@
 
 
 #include <apt-pkg/pkgcache.h>
 
 
 #include <apt-pkg/pkgcache.h>

-#include <apt-pkg/fileutl.h>

 #include <vector>
 
 class pkgRecords                                                       /*{{{*/
 #include <vector>
 
 class pkgRecords                                                       /*{{{*/


@@ -28,12 +27,13 @@ class pkgRecords                                                    /*{{{*/
    class Parser;
    
    private:
    class Parser;
    
    private:

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

    
    pkgCache &Cache;
    std::vector<Parser *>Files;
 
    
    pkgCache &Cache;
    std::vector<Parser *>Files;
 

-   public:
-
+    public:

    // Lookup function
    Parser &Lookup(pkgCache::VerFileIterator const &Ver);
    Parser &Lookup(pkgCache::DescFileIterator const &Desc);
    // Lookup function
    Parser &Lookup(pkgCache::VerFileIterator const &Ver);
    Parser &Lookup(pkgCache::DescFileIterator const &Desc);


@@ -54,20 +54,24 @@ class pkgRecords::Parser                                            /*{{{*/
    friend class pkgRecords;
    
    // These refer to the archive file for the Version
    friend class pkgRecords;
    
    // These refer to the archive file for the Version

-   virtual string FileName() {return string();};
-   virtual string MD5Hash() {return string();};
-   virtual string SHA1Hash() {return string();};
-   virtual string SHA256Hash() {return string();};
-   virtual string SourcePkg() {return string();};
-   virtual string SourceVer() {return string();};
+   virtual std::string FileName() {return std::string();};
+   virtual std::string MD5Hash() {return std::string();};
+   virtual std::string SHA1Hash() {return std::string();};
+   virtual std::string SHA256Hash() {return std::string();};
+   virtual std::string SHA512Hash() {return std::string();};
+   virtual std::string SourcePkg() {return std::string();};
+   virtual std::string SourceVer() {return std::string();};

 
    // These are some general stats about the package
 
    // These are some general stats about the package

-   virtual string Maintainer() {return string();};
-   virtual string ShortDesc() {return string();};
-   virtual string LongDesc() {return string();};
-   virtual string Name() {return string();};
-   virtual string Homepage() {return string();}
-   
+   virtual std::string Maintainer() {return std::string();};
+   virtual std::string ShortDesc() {return std::string();};
+   virtual std::string LongDesc() {return std::string();};
+   virtual std::string Name() {return std::string();};
+   virtual std::string Homepage() {return std::string();}
+
+   // An arbitrary custom field
+   virtual std::string RecordField(const char *fieldName) { return std::string();};
+

    // The record in binary form
    virtual void GetRec(const char *&Start,const char *&Stop) {Start = Stop = 0;};
    
    // The record in binary form
    virtual void GetRec(const char *&Start,const char *&Stop) {Start = Stop = 0;};