fix -Wmissing-field-initializers warnings

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

diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 307b121335cbfdd80f38948082d669feb0dddc44..0ccb4aa0052c8f7311ac4b14d778207e5df6d892 100644 (file)
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: sourcelist.h,v 1.12 2002/07/01 21:41:11 jgg Exp $
+// $Id: sourcelist.h,v 1.12.2.1 2003/12/24 23:09:17 mdz Exp $

 /* ######################################################################
 
    SourceList - Manage a list of sources
 /* ######################################################################
 
    SourceList - Manage a list of sources


@@ -20,7 +20,7 @@
    
    The vendor machanism is similar, except the vendor types are hard 
    wired. Before loading the source list the vendor list is loaded.
    
    The vendor machanism is similar, except the vendor types are hard 
    wired. Before loading the source list the vendor list is loaded.

-   This doesn't load key data, just the checks to preform.
+   This doesn't load key data, just the checks to perform.

    
    ##################################################################### */
                                                                        /*}}}*/
    
    ##################################################################### */
                                                                        /*}}}*/


@@ -29,33 +29,24 @@
 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>

+#include <map>

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

-#include <apt-pkg/indexfile.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:
    

-   // An available vendor
-   struct Vendor
-   {
-      string VendorID;
-      string FingerPrint;
-      string Description;
-
-      /* Lets revisit these..
-      bool MatchFingerPrint(string FingerPrint);
-      string FingerPrintDescr();*/
-   };
-   

    // List of supported source list types
    class Type
    {
    // List of supported source list types
    class Type
    {


@@ -69,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<pkgIndexFile *> &List,
-                            Vendor const *Vendor,
+      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<pkgIndexFile *> &List,string URI,
-                             string Dist,string Section,
-                             Vendor const *Vendor) 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<pkgIndexFile *>::const_iterator const_iterator;
+   typedef std::vector<metaIndex *>::const_iterator const_iterator;

    
    protected:
 
    
    protected:
 

-   vector<pkgIndexFile *> SrcList;
-   vector<Vendor const *> VendorList;
-   
+   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 ReadVendors();
+   bool Read(std::string File);
+
+   // CNC:2003-03-03
+   void Reset();
+   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();};


@@ -103,10 +102,13 @@ class pkgSourceList
 
    bool FindIndex(pkgCache::PkgFileIterator File,
                  pkgIndexFile *&Found) const;
 
    bool FindIndex(pkgCache::PkgFileIterator File,
                  pkgIndexFile *&Found) const;

-   bool GetIndexes(pkgAcquire *Owner) 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();      
 };