Fix a segfault in the version merger introduced in the previous patch:

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

diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h
index 0bd8da921f3bbabcce265878253074580fb6cfc7..6f358abfa3225b5a2034fbb88ea1de20a63a689d 100644 (file)
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: debrecords.h,v 1.1 1998/08/09 00:51:36 jgg Exp $
+// $Id: debrecords.h,v 1.8 2001/03/13 06:51:46 jgg Exp $
 /* ######################################################################
    
    Debian Package Records - Parser for debian package records
@@ -11,28 +11,44 @@
    
    ##################################################################### */
                                                                        /*}}}*/
-// Header section: pkglib
 #ifndef PKGLIB_DEBRECORDS_H
 #define PKGLIB_DEBRECORDS_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/debrecords.h"
-#endif 
-
 #include <apt-pkg/pkgrecords.h>
+#include <apt-pkg/indexfile.h>
 #include <apt-pkg/tagfile.h>
 
 class debRecordParser : public pkgRecords::Parser
 {
+   FileFd File;
    pkgTagFile Tags;
    pkgTagSection Section;
    
+   protected:
+   
+   virtual bool Jump(pkgCache::VerFileIterator const &Ver);
+   virtual bool Jump(pkgCache::DescFileIterator const &Desc);
+   
    public:
+
+   // These refer to the archive file for the Version
+   virtual string FileName();
+   virtual string MD5Hash();
+   virtual string SHA1Hash();
+   virtual string SHA256Hash();
+   virtual string SourcePkg();
+   virtual string SourceVer();
    
-   virtual bool Jump(pkgCache::VerFileIterator &Ver);
+   // These are some general stats about the package
+   virtual string Maintainer();
+   virtual string ShortDesc();
+   virtual string LongDesc();
+   virtual string Name();
+   virtual string Homepage();
+
+   virtual void GetRec(const char *&Start,const char *&Stop);
    
-   debRecordParser(FileFd &File);
+   debRecordParser(string FileName,pkgCache &Cache);
 };
 
-
 #endif