fix -Wmissing-field-initializers warnings

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

diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h
index bd39b93bb1b2c018c6d539c1af0f5533319569ac..ed69d0d72d470cfa9dfe18406c394c432c1b6bf3 100644 (file)
--- a/apt-pkg/srcrecords.h
+++ b/apt-pkg/srcrecords.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: srcrecords.h,v 1.1 1999/04/04 01:17:29 jgg Exp $
+// $Id: srcrecords.h,v 1.8.2.1 2003/12/26 16:27:34 mdz Exp $

 /* ######################################################################
    
    Source Package Records - Allows access to source package records
 /* ######################################################################
    
    Source Package Records - Allows access to source package records


@@ -13,43 +13,81 @@
 #ifndef PKGLIB_SRCRECORDS_H
 #define PKGLIB_SRCRECORDS_H
 
 #ifndef PKGLIB_SRCRECORDS_H
 #define PKGLIB_SRCRECORDS_H
 

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

 
 

-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/sourcelist.h>
+#include <string>
+#include <vector>

 
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+using std::vector;
+#endif
+
+class pkgSourceList;
+class pkgIndexFile;

 class pkgSrcRecords
 {
    public:
 class pkgSrcRecords
 {
    public:

+
+   // Describes a single file
+   struct File
+   {
+      std::string MD5Hash;
+      unsigned long Size;
+      std::string Path;
+      std::string Type;
+   };

    
    

+   // Abstract parser for each source record

    class Parser
    {
    class Parser
    {

-      FileFd *File;
-     
+      protected:
+      
+      const pkgIndexFile *iIndex;
+      

       public:
 
       public:
 

+      enum BuildDep {BuildDepend=0x0,BuildDependIndep=0x1,
+                    BuildConflict=0x2,BuildConflictIndep=0x3};
+
+      struct BuildDepRec 
+      {
+        std::string Package;
+        std::string Version;
+        unsigned int Op;
+        unsigned char Type;
+      };
+       
+      inline const pkgIndexFile &Index() const {return *iIndex;};
+      

       virtual bool Restart() = 0;
       virtual bool Step() = 0;
       virtual bool Restart() = 0;
       virtual bool Step() = 0;

-      virtual bool Jump(unsigned long Off) = 0;
+      virtual bool Jump(unsigned long const &Off) = 0;

       virtual unsigned long Offset() = 0;
       virtual unsigned long Offset() = 0;

+      virtual std::string AsStr() = 0;

       
       

-      virtual string Package() = 0;
-      virtual string Version() = 0;
-      virtual string Maintainer() = 0;
-      virtual string Section() = 0;
-      virtual const char **Binaries() = 0;
+      virtual std::string Package() const = 0;
+      virtual std::string Version() const = 0;
+      virtual std::string Maintainer() const = 0;
+      virtual std::string Section() const = 0;
+      virtual const char **Binaries() = 0;   // Ownership does not transfer
+
+      //FIXME: Add a parameter to specify which architecture to use for [wildcard] matching
+      virtual bool BuildDepends(std::vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true) = 0;
+      static const char *BuildDepType(unsigned char const &Type);
+
+      virtual bool Files(std::vector<pkgSrcRecords::File> &F) = 0;

       
       

-      Parser(FileFd *File) : File(File) {};
-      virtual ~Parser() {delete File;};
+      Parser(const pkgIndexFile *Index) : iIndex(Index) {};
+      virtual ~Parser() {};

    };
    
    private:
    };
    
    private:

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

    
    // The list of files and the current parser pointer
    
    // The list of files and the current parser pointer

-   Parser **Files;
-   Parser **Current;
+   std::vector<Parser*> Files;
+   std::vector<Parser *>::iterator Current;

    
    public:
 
    
    public:
 


@@ -57,11 +95,10 @@ class pkgSrcRecords
    bool Restart();
 
    // Locate a package by name
    bool Restart();
 
    // Locate a package by name

-   Parser *Find(const char *Package,bool SrcOnly = false);
+   Parser *Find(const char *Package,bool const &SrcOnly = false);

    
    pkgSrcRecords(pkgSourceList &List);
    
    pkgSrcRecords(pkgSourceList &List);

-   ~pkgSrcRecords();
+   virtual ~pkgSrcRecords();

 };
 
 };
 

-

 #endif
 #endif