Bug #807012 also involves package dependencies :/.

[apt.git] / apt-pkg / contrib / hashsum_template.h

diff --git a/apt-pkg/contrib/hashsum_template.h b/apt-pkg/contrib/hashsum_template.h
index 9157754e36fe26916b4a73f2ea4d09fadde10b16..e5032d02fd6f7b4f2e284cc65e801c9f030fb714 100644 (file)
--- a/apt-pkg/contrib/hashsum_template.h
+++ b/apt-pkg/contrib/hashsum_template.h
@@ -10,28 +10,45 @@
 #ifndef APTPKG_HASHSUM_TEMPLATE_H
 #define APTPKG_HASHSUM_TEMPLATE_H
 
 #ifndef APTPKG_HASHSUM_TEMPLATE_H
 #define APTPKG_HASHSUM_TEMPLATE_H
 

+

 #include <string>
 #include <cstring>
 #include <string>
 #include <cstring>

+#ifdef APT_PKG_EXPOSE_STRING_VIEW
+#include <apt-pkg/string_view.h>
+#endif
+
+#include <apt-pkg/strutl.h>
+
+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/fileutl.h>

 #include <algorithm>
 #include <stdint.h>
 #include <algorithm>
 #include <stdint.h>

-
+#endif
+#ifndef APT_8_CLEANER_HEADERS

 using std::string;
 using std::min;
 using std::string;
 using std::min;

+#endif
+
+class FileFd;

 
 template<int N>
 class HashSumValue
 {
    unsigned char Sum[N/8];
 
 template<int N>
 class HashSumValue
 {
    unsigned char Sum[N/8];

-   
+

    public:
 
    // Accessors
    bool operator ==(const HashSumValue &rhs) const
    {
       return memcmp(Sum,rhs.Sum,sizeof(Sum)) == 0;
    public:
 
    // Accessors
    bool operator ==(const HashSumValue &rhs) const
    {
       return memcmp(Sum,rhs.Sum,sizeof(Sum)) == 0;

-   }; 
+   }
+   bool operator !=(const HashSumValue &rhs) const
+   {
+      return memcmp(Sum,rhs.Sum,sizeof(Sum)) != 0;
+   }

 
 

-   string Value() const
+   std::string Value() const

    {
       char Conv[16] =
       { '0','1','2','3','4','5','6','7','8','9','a','b',
    {
       char Conv[16] =
       { '0','1','2','3','4','5','6','7','8','9','a','b',


@@ -39,7 +56,7 @@ class HashSumValue
       };
       char Result[((N/8)*2)+1];
       Result[(N/8)*2] = 0;
       };
       char Result[((N/8)*2)+1];
       Result[(N/8)*2] = 0;

-      
+

       // Convert each char into two letters
       int J = 0;
       int I = 0;
       // Convert each char into two letters
       int J = 0;
       int I = 0;


@@ -48,36 +65,54 @@ class HashSumValue
          Result[I] = Conv[Sum[J] >> 4];
          Result[I + 1] = Conv[Sum[J] & 0xF];
       }
          Result[I] = Conv[Sum[J] >> 4];
          Result[I + 1] = Conv[Sum[J] & 0xF];
       }

-      return string(Result);
-   };
-   
+      return std::string(Result);
+   }
+

    inline void Value(unsigned char S[N/8])
    {
    inline void Value(unsigned char S[N/8])
    {

-      for (int I = 0; I != sizeof(Sum); I++) 
+      for (int I = 0; I != sizeof(Sum); ++I)

          S[I] = Sum[I];
          S[I] = Sum[I];

-   };
+   }

 
 

-   inline operator string() const 
+   inline operator std::string() const

    {
       return Value();
    {
       return Value();

-   };
+   }

 
 

-   bool Set(string Str) 
+#ifdef APT_PKG_EXPOSE_STRING_VIEW
+   APT_HIDDEN bool Set(APT::StringView Str)

    {
       return Hex2Num(Str,Sum,sizeof(Sum));
    {
       return Hex2Num(Str,Sum,sizeof(Sum));

-   };
-
-   inline void Set(unsigned char S[N/8]) 
+   }
+#else
+   bool Set(std::string Str)

    {
    {

-      for (int I = 0; I != sizeof(Sum); I++) 
+      return Hex2Num(Str,Sum,sizeof(Sum));
+   }
+#endif
+   inline void Set(unsigned char S[N/8])
+   {
+      for (int I = 0; I != sizeof(Sum); ++I)

          Sum[I] = S[I];
          Sum[I] = S[I];

-   };
+   }

 
 

-   HashSumValue(string Str) 
+   explicit HashSumValue(std::string const &Str)

    {
          memset(Sum,0,sizeof(Sum));
          Set(Str);
    }
    {
          memset(Sum,0,sizeof(Sum));
          Set(Str);
    }

+#ifdef APT_PKG_EXPOSE_STRING_VIEW
+   APT_HIDDEN explicit HashSumValue(APT::StringView const &Str)
+   {
+         memset(Sum,0,sizeof(Sum));
+         Set(Str);
+   }
+   APT_HIDDEN explicit HashSumValue(const char *Str)
+   {
+         memset(Sum,0,sizeof(Sum));
+         Set(Str);
+   }
+#endif

    HashSumValue()
    {
       memset(Sum,0,sizeof(Sum));
    HashSumValue()
    {
       memset(Sum,0,sizeof(Sum));


@@ -87,21 +122,22 @@ class HashSumValue
 class SummationImplementation
 {
    public:
 class SummationImplementation
 {
    public:

-   virtual bool Add(const unsigned char *inbuf, unsigned long long inlen) = 0;
-   inline bool Add(const char *inbuf, unsigned long long const inlen)
-   { return Add((unsigned char *)inbuf, inlen); };
+   virtual bool Add(const unsigned char *inbuf, unsigned long long inlen) APT_NONNULL(2) = 0;
+   inline bool Add(const char *inbuf, unsigned long long const inlen) APT_NONNULL(2)
+   { return Add((const unsigned char *)inbuf, inlen); }

 
 

-   inline bool Add(const unsigned char *Data)
-   { return Add(Data, strlen((const char *)Data)); };
-   inline bool Add(const char *Data)
-   { return Add((const unsigned char *)Data, strlen((const char *)Data)); };
+   inline bool Add(const unsigned char *Data) APT_NONNULL(2)
+   { return Add(Data, strlen((const char *)Data)); }
+   inline bool Add(const char *Data) APT_NONNULL(2)
+   { return Add((const unsigned char *)Data, strlen(Data)); }

 
 

-   inline bool Add(const unsigned char *Beg, const unsigned char *End)
-   { return Add(Beg, End - Beg); };
-   inline bool Add(const char *Beg, const char *End)
-   { return Add((const unsigned char *)Beg, End - Beg); };
+   inline bool Add(const unsigned char *Beg, const unsigned char *End) APT_NONNULL(2,3)
+   { return Add(Beg, End - Beg); }
+   inline bool Add(const char *Beg, const char *End) APT_NONNULL(2,3)
+   { return Add((const unsigned char *)Beg, End - Beg); }

 
    bool AddFD(int Fd, unsigned long long Size = 0);
 
    bool AddFD(int Fd, unsigned long long Size = 0);

+   bool AddFD(FileFd &Fd, unsigned long long Size = 0);

 };
 
 #endif
 };
 
 #endif