Fix the test suite again

[apt.git] / methods / rred.cc

diff --git a/methods/rred.cc b/methods/rred.cc
index 81ecf855318610a33a42089034901d8f7fe2b320..91b6dda222bcaa6bcad72ba5880c76e3e6de8344 100644 (file)
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -405,12 +405,12 @@ class Patch {
            size_t s, e;
            errno = 0;
            s = strtoul(buffer, &m, 10);
-           if (unlikely(m == buffer || s == ULONG_MAX || errno != 0))
+           if (unlikely(m == buffer || s == std::numeric_limits<unsigned long>::max() || errno != 0))
               return _error->Error("Parsing patchfile %s failed: Expected an effected line start", f.Name().c_str());
            else if (*m == ',') {
               ++m;
               e = strtol(m, &c, 10);
-              if (unlikely(m == c || e == ULONG_MAX || errno != 0))
+              if (unlikely(m == c || e == std::numeric_limits<unsigned long>::max() || errno != 0))
                  return _error->Error("Parsing patchfile %s failed: Expected an effected line end", f.Name().c_str());
               if (unlikely(e < s))
                  return _error->Error("Parsing patchfile %s failed: Effected lines end %lu is before start %lu", f.Name().c_str(), e, s);
@@ -558,7 +558,7 @@ class RredMethod : public pkgAcqMethod {
       }
 
    protected:
-      virtual bool URIAcquire(std::string const &Message, FetchItem *Itm) {
+      virtual bool URIAcquire(std::string const &Message, FetchItem *Itm) APT_OVERRIDE {
         Debug = _config->FindB("Debug::pkgAcquire::RRed", false);
         URI Get = Itm->Uri;
         std::string Path = Get.Host + Get.Path; // rred:/path - no host
@@ -627,7 +627,7 @@ class RredMethod : public pkgAcqMethod {
            p.Close();
            HashStringList const hsl = patch_hash.GetHashStringList();
            if (hsl != I->ExpectedHashes)
-              return _error->Error("Patch %s doesn't have the expected hashsum", patch_name.c_str());
+              return _error->Error("Hash Sum mismatch for uncompressed patch %s", patch_name.c_str());
         }
 
         if (Debug == true)
@@ -671,7 +671,7 @@ class RredMethod : public pkgAcqMethod {
         return true;
       }
 
-      bool Configuration(std::string Message)
+      bool Configuration(std::string Message) APT_OVERRIDE
       {
         if (pkgAcqMethod::Configuration(Message) == false)
            return false;