test framework: Correctly generate new paths in noopchroot

[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 9bf160b2be527b92e09d33b55c4b51906801af59..d0ea0971ea5e2502e92ef18845789604765836fa 100644 (file)
--- a/apt-pkg/contrib/hashsum_template.h
+++ b/apt-pkg/contrib/hashsum_template.h
@@ -10,36 +10,40 @@
 #ifndef APTPKG_HASHSUM_TEMPLATE_H
 #define APTPKG_HASHSUM_TEMPLATE_H
 
 #ifndef APTPKG_HASHSUM_TEMPLATE_H
 #define APTPKG_HASHSUM_TEMPLATE_H
 

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

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

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

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

+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/fileutl.h>
+#include <algorithm>
+#include <stdint.h>
+#endif

 #ifndef APT_8_CLEANER_HEADERS
 using std::string;
 using std::min;
 #endif
 
 #ifndef APT_8_CLEANER_HEADERS
 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;
    bool operator !=(const HashSumValue &rhs) const
    {
       return memcmp(Sum,rhs.Sum,sizeof(Sum)) != 0;

-   };
+   }

 
    std::string Value() const
    {
 
    std::string Value() const
    {


@@ -49,7 +53,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;


@@ -59,31 +63,31 @@ class HashSumValue
          Result[I + 1] = Conv[Sum[J] & 0xF];
       }
       return std::string(Result);
          Result[I + 1] = Conv[Sum[J] & 0xF];
       }
       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 std::string() const 
+   inline operator std::string() const

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

-   };
+   }

 
 

-   bool Set(std::string Str) 
+   bool Set(std::string Str)

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

-   };
+   }

 
 

-   inline void Set(unsigned char S[N/8]) 
+   inline void Set(unsigned char S[N/8])

    {
    {

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

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

-   };
+   }

 
 

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

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


@@ -99,17 +103,17 @@ 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)
    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); };
+   { return Add((const unsigned char *)inbuf, inlen); }

 
    inline bool Add(const unsigned char *Data)
 
    inline bool Add(const unsigned char *Data)

-   { return Add(Data, strlen((const char *)Data)); };
+   { return Add(Data, strlen((const char *)Data)); }

    inline bool Add(const char *Data)
    inline bool Add(const char *Data)

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

 
    inline bool Add(const unsigned char *Beg, const unsigned char *End)
 
    inline bool Add(const unsigned char *Beg, const unsigned char *End)

-   { return Add(Beg, End - Beg); };
+   { return Add(Beg, End - Beg); }

    inline bool Add(const char *Beg, const char *End)
    inline bool Add(const char *Beg, const char *End)

-   { return Add((const unsigned char *)Beg, End - Beg); };
+   { return Add((const unsigned char *)Beg, End - Beg); }

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