don't leak on error in listparser creation

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

diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h
index 8741533b99dcc0ebeca9db63d5894037cfdd546b..8da3265c67cfa7d9900a74c3ae27aff26c7f6014 100644 (file)
--- a/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@ -17,8 +17,11 @@
 #ifndef PKGLIB_PKGRECORDS_H
 #define PKGLIB_PKGRECORDS_H
 
 #ifndef PKGLIB_PKGRECORDS_H
 #define PKGLIB_PKGRECORDS_H
 

-

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

+#include <apt-pkg/hashes.h>
+#include <apt-pkg/macros.h>
+
+#include <string>

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


@@ -28,7 +31,7 @@ class pkgRecords                                                      /*{{{*/
    
    private:
    /** \brief dpointer placeholder (for later in case we need it) */
    
    private:
    /** \brief dpointer placeholder (for later in case we need it) */

-   void *d;
+   void * const d;

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


@@ -39,8 +42,8 @@ class pkgRecords                                                      /*{{{*/
    Parser &Lookup(pkgCache::DescFileIterator const &Desc);
 
    // Construct destruct
    Parser &Lookup(pkgCache::DescFileIterator const &Desc);
 
    // Construct destruct

-   pkgRecords(pkgCache &Cache);
-   ~pkgRecords();
+   explicit pkgRecords(pkgCache &Cache);
+   virtual ~pkgRecords();

 };
                                                                        /*}}}*/
 class pkgRecords::Parser                                               /*{{{*/
 };
                                                                        /*}}}*/
 class pkgRecords::Parser                                               /*{{{*/


@@ -54,28 +57,60 @@ 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 SHA512Hash() {return string();};
-   virtual string SourcePkg() {return string();};
-   virtual string SourceVer() {return string();};
+   virtual std::string FileName() {return std::string();};
+   virtual std::string SourcePkg() {return std::string();};
+   virtual std::string SourceVer() {return std::string();};
+
+   /** return all known hashes in this record.
+    *
+    * For authentication proposes packages come with hashsums which
+    * this method is supposed to parse and return so that clients can
+    * choose the hash to be used.
+    */
+   virtual HashStringList Hashes() const { return HashStringList(); };
+   APT_DEPRECATED_MSG("Use .Hashes instead of a hardcoded hash algorithm") std::string MD5Hash() const { return GetHashFromHashes("MD5Sum"); };
+   APT_DEPRECATED_MSG("Use .Hashes instead of a hardcoded hash algorithm") std::string SHA1Hash() const { return GetHashFromHashes("SHA1"); };
+   APT_DEPRECATED_MSG("Use .Hashes instead of a hardcoded hash algorithm") std::string SHA256Hash() const { return GetHashFromHashes("SHA256"); };
+   APT_DEPRECATED_MSG("Use .Hashes instead of a hardcoded hash algorithm") std::string SHA512Hash() const { return GetHashFromHashes("SHA512"); };

 
    // 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();};
+   /** return short description in language from record.
+    *
+    * @see #LongDesc
+    */
+   virtual std::string ShortDesc(std::string const &/*lang*/) {return std::string();};
+   /** return long description in language from record.
+    *
+    * If \b lang is empty the "best" available language will be
+    * returned as determined by the APT::Languages configuration.
+    * If a (requested) language can't be found in this record an empty
+    * string will be returned.
+    */
+   virtual std::string LongDesc(std::string const &/*lang*/) {return std::string();};
+   std::string ShortDesc() {return ShortDesc("");};
+   std::string LongDesc() {return LongDesc("");};
+
+   virtual std::string Name() {return std::string();};
+   virtual std::string Homepage() {return std::string();}

 
    // An arbitrary custom field
 
    // An arbitrary custom field

-   virtual string RecordField(const char *fieldName) { return string();};
+   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;};

-   
-   virtual ~Parser() {};
+
+   Parser();
+   virtual ~Parser();
+
+   private:
+   void * const d;
+   APT_HIDDEN std::string GetHashFromHashes(char const * const type) const
+   {
+      HashStringList const hashes = Hashes();
+      HashString const * const hs = hashes.find(type);
+      return hs != NULL ? hs->HashValue() : "";
+   };

 };
                                                                        /*}}}*/
 #endif
 };
                                                                        /*}}}*/
 #endif