From 927c08f2d378e8be9eba97fc1a3c790557d8fb70 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Tue, 25 Feb 2020 20:48:01 +0100
Subject: Remove left-over SummationImplementation class

---
 apt-pkg/contrib/hashsum.cc         | 52 --------------------------------------
 apt-pkg/contrib/hashsum_template.h | 21 ---------------
 2 files changed, 73 deletions(-)
 delete mode 100644 apt-pkg/contrib/hashsum.cc

(limited to 'apt-pkg/contrib')

diff --git a/apt-pkg/contrib/hashsum.cc b/apt-pkg/contrib/hashsum.cc
deleted file mode 100644
index e8e86e92c..000000000
--- a/apt-pkg/contrib/hashsum.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-// Cryptographic API Base
-#include <config.h>
-
-#include <apt-pkg/fileutl.h>
-
-#include "hashsum_template.h"
-#include <algorithm>
-#include <unistd.h>
-
-// Summation::AddFD - Add content of file into the checksum		/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool SummationImplementation::AddFD(int const Fd, unsigned long long Size) {
-   unsigned char Buf[64 * 64];
-   bool const ToEOF = (Size == 0);
-   while (Size != 0 || ToEOF)
-   {
-      unsigned long long n = sizeof(Buf);
-      if (!ToEOF) n = std::min(Size, n);
-      ssize_t const Res = read(Fd, Buf, n);
-      if (Res < 0 || (!ToEOF && Res != (ssize_t) n)) // error, or short read
-	 return false;
-      if (ToEOF && Res == 0) // EOF
-	 break;
-      Size -= Res;
-      Add(Buf,Res);
-   }
-   return true;
-}
-bool SummationImplementation::AddFD(FileFd &Fd, unsigned long long Size) {
-   unsigned char Buf[64 * 64];
-   bool const ToEOF = (Size == 0);
-   while (Size != 0 || ToEOF)
-   {
-      unsigned long long n = sizeof(Buf);
-      if (!ToEOF) n = std::min(Size, n);
-      unsigned long long a = 0;
-      if (Fd.Read(Buf, n, &a) == false) // error
-	 return false;
-      if (ToEOF == false)
-      {
-	 if (a != n) // short read
-	    return false;
-      }
-      else if (a == 0) // EOF
-	 break;
-      Size -= a;
-      Add(Buf, a);
-   }
-   return true;
-}
-									/*}}}*/
diff --git a/apt-pkg/contrib/hashsum_template.h b/apt-pkg/contrib/hashsum_template.h
index 12c46e77b..61b047465 100644
--- a/apt-pkg/contrib/hashsum_template.h
+++ b/apt-pkg/contrib/hashsum_template.h
@@ -97,25 +97,4 @@ class HashSumValue
    }
 };
 
-class SummationImplementation
-{
-   public:
-   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(reinterpret_cast<const unsigned char *>(inbuf), inlen); }
-
-   inline bool Add(const unsigned char *Data) APT_NONNULL(2)
-   { return Add(Data, strlen(reinterpret_cast<const char *>(Data))); }
-   inline bool Add(const char *Data) APT_NONNULL(2)
-   { return Add(reinterpret_cast<const unsigned char *>(Data), strlen(Data)); }
-
-   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(reinterpret_cast<const unsigned char *>(Beg), End - Beg); }
-
-   bool AddFD(int Fd, unsigned long long Size = 0);
-   bool AddFD(FileFd &Fd, unsigned long long Size = 0);
-};
-
 #endif
-- 
cgit v1.2.3-70-g09d2