fix -Wmissing-field-initializers warnings

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

diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 123ae69849fedadbf5781ed57e8e669768d932fe..0ccb4aa0052c8f7311ac4b14d778207e5df6d892 100644 (file)
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -29,17 +29,20 @@
 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>

+#include <map>

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

-#include <apt-pkg/metaindex.h>
+#include <apt-pkg/tagfile.h>

 
 

+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/metaindex.h>

 using std::string;
 using std::vector;
 using std::string;
 using std::vector;

-    
-#ifdef __GNUG__
-#pragma interface "apt-pkg/sourcelist.h"

 #endif
 
 #endif
 

-class pkgAquire;
+class pkgAcquire;
+class pkgIndexFile;
+class metaIndex;
+

 class pkgSourceList
 {
    public:
 class pkgSourceList
 {
    public:


@@ -57,31 +60,39 @@ class pkgSourceList
       const char *Name;
       const char *Label;
 
       const char *Name;
       const char *Label;
 

-      bool FixupURI(string &URI) const;
-      virtual bool ParseLine(vector<metaIndex *> &List,
+      bool FixupURI(std::string &URI) const;
+      virtual bool ParseStanza(std::vector<metaIndex *> &List,
+                               pkgTagSection &Tags,
+                               int stanza_n,
+                               FileFd &Fd);
+      virtual bool ParseLine(std::vector<metaIndex *> &List,

                             const char *Buffer,
                             const char *Buffer,

-                            unsigned long CurLine,string File) const;
-      virtual bool CreateItem(vector<metaIndex *> &List,string URI,
-                             string Dist,string Section) const = 0;
+                            unsigned long const &CurLine,std::string const &File) const;
+      virtual bool CreateItem(std::vector<metaIndex *> &List,std::string const &URI,
+                             std::string const &Dist,std::string const &Section,
+                             std::map<std::string, std::string> const &Options) const = 0;

       Type();
       virtual ~Type() {};
    };
    
       Type();
       virtual ~Type() {};
    };
    

-   typedef vector<metaIndex *>::const_iterator const_iterator;
+   typedef std::vector<metaIndex *>::const_iterator const_iterator;

    
    protected:
 
    
    protected:
 

-   vector<metaIndex *> SrcList;
-   
+   std::vector<metaIndex *> SrcList;
+
+   int ParseFileDeb822(std::string File);
+   bool ParseFileOldStyle(std::string File);
+

    public:
 
    bool ReadMainList();
    public:
 
    bool ReadMainList();

-   bool Read(string File);
+   bool Read(std::string File);

 
    // CNC:2003-03-03
    void Reset();
 
    // CNC:2003-03-03
    void Reset();

-   bool ReadAppend(string File);
-   bool ReadSourceDir(string Dir);
+   bool ReadAppend(std::string File);
+   bool ReadSourceDir(std::string Dir);

    
    // List accessors
    inline const_iterator begin() const {return SrcList.begin();};
    
    // List accessors
    inline const_iterator begin() const {return SrcList.begin();};


@@ -93,8 +104,11 @@ class pkgSourceList
                  pkgIndexFile *&Found) const;
    bool GetIndexes(pkgAcquire *Owner, bool GetAll=false) const;
    
                  pkgIndexFile *&Found) const;
    bool GetIndexes(pkgAcquire *Owner, bool GetAll=false) const;
    

+   // query last-modified time
+   time_t GetLastModifiedTime();
+

    pkgSourceList();
    pkgSourceList();

-   pkgSourceList(string File);
+   pkgSourceList(std::string File);

    ~pkgSourceList();      
 };
 
    ~pkgSourceList();      
 };