Introduce tolower_ascii_unsafe() and use it for hashing

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

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

-// $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


@@ -30,27 +29,26 @@ class pkgSrcRecords
 {
    public:
 
 {
    public:
 

-#if __GNUC__ >= 4
-       // ensure that con- & de-structor don't trigger this warning
-       #pragma GCC diagnostic push
-       #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_PUSH

    // Describes a single file
    struct File
    {
    // Describes a single file
    struct File
    {

+      APT_DEPRECATED_MSG("Use Hashes member instead of hardcoded hash algorithm") std::string MD5Hash;
+      APT_DEPRECATED_MSG("Use FileSize member instead") unsigned long Size;

       std::string Path;
       std::string Type;
       std::string Path;
       std::string Type;

-      unsigned long long Size;
+   };
+   struct File2 : public File
+   {
+      unsigned long long FileSize;

       HashStringList Hashes;
       HashStringList Hashes;

-      APT_DEPRECATED std::string MD5Hash;

    };
    };

-#if __GNUC__ >= 4
-       #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP

 
    // Abstract parser for each source record
    class Parser
    {
 
    // Abstract parser for each source record
    class Parser
    {

+      void * const d;

       protected:
       
       const pkgIndexFile *iIndex;
       protected:
       
       const pkgIndexFile *iIndex;


@@ -58,7 +56,8 @@ class pkgSrcRecords
       public:
 
       enum BuildDep {BuildDepend=0x0,BuildDependIndep=0x1,
       public:
 
       enum BuildDep {BuildDepend=0x0,BuildDependIndep=0x1,

-                    BuildConflict=0x2,BuildConflictIndep=0x3};
+                    BuildConflict=0x2,BuildConflictIndep=0x3,
+                    BuildDependArch=0x4,BuildConflictArch=0x5};

 
       struct BuildDepRec 
       {
 
       struct BuildDepRec 
       {


@@ -87,14 +86,15 @@ class pkgSrcRecords
       static const char *BuildDepType(unsigned char const &Type) APT_PURE;
 
       virtual bool Files(std::vector<pkgSrcRecords::File> &F) = 0;
       static const char *BuildDepType(unsigned char const &Type) APT_PURE;
 
       virtual bool Files(std::vector<pkgSrcRecords::File> &F) = 0;

-      
-      Parser(const pkgIndexFile *Index) : iIndex(Index) {};
-      virtual ~Parser() {};
+      bool Files2(std::vector<pkgSrcRecords::File2> &F);
+
+      explicit Parser(const pkgIndexFile *Index);
+      virtual ~Parser();

    };
    
    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;

    
    // The list of files and the current parser pointer
    std::vector<Parser*> Files;
    
    // The list of files and the current parser pointer
    std::vector<Parser*> Files;


@@ -112,8 +112,8 @@ class pkgSrcRecords
    // Locate a package by name and return pointer to the Parser.
    // The pointer is owned by libapt.
    Parser* Find(const char *Package,bool const &SrcOnly = false);
    // Locate a package by name and return pointer to the Parser.
    // The pointer is owned by libapt.
    Parser* Find(const char *Package,bool const &SrcOnly = false);

-   
-   pkgSrcRecords(pkgSourceList &List);
+
+   explicit pkgSrcRecords(pkgSourceList &List);

    virtual ~pkgSrcRecords();
 };
 
    virtual ~pkgSrcRecords();
 };