From 04fe2a1706b4bd71b604bfe7d7295064440872cf Mon Sep 17 00:00:00 2001 From: Peter Eriksen Date: Sat, 4 Feb 2006 23:54:01 +0100 Subject: [PATCH] Use adler32() from zlib instead of defining our own. Since we already depend on zlib, we don't need to define our own adler32(). Spotted by oprofile. Signed-off-by: Peter Eriksen Signed-off-by: Junio C Hamano --- diff-delta.c | 39 +-------------------------------------- 1 file changed, 1 insertion(+), 38 deletions(-) diff --git a/diff-delta.c b/diff-delta.c index 890986eeb..c2f656ae3 100644 --- a/diff-delta.c +++ b/diff-delta.c @@ -20,6 +20,7 @@ #include #include "delta.h" +#include "zlib.h" /* block size: min = 16, max = 64k, power of 2 */ @@ -30,44 +31,6 @@ #define GR_PRIME 0x9e370001 #define HASH(v, b) (((unsigned int)(v) * GR_PRIME) >> (32 - (b))) -/* largest prime smaller than 65536 */ -#define BASE 65521 - -/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ -#define NMAX 5552 - -#define DO1(buf, i) { s1 += buf[i]; s2 += s1; } -#define DO2(buf, i) DO1(buf, i); DO1(buf, i + 1); -#define DO4(buf, i) DO2(buf, i); DO2(buf, i + 2); -#define DO8(buf, i) DO4(buf, i); DO4(buf, i + 4); -#define DO16(buf) DO8(buf, 0); DO8(buf, 8); - -static unsigned int adler32(unsigned int adler, const unsigned char *buf, int len) -{ - int k; - unsigned int s1 = adler & 0xffff; - unsigned int s2 = adler >> 16; - - while (len > 0) { - k = MIN(len, NMAX); - len -= k; - while (k >= 16) { - DO16(buf); - buf += 16; - k -= 16; - } - if (k != 0) - do { - s1 += *buf++; - s2 += s1; - } while (--k); - s1 %= BASE; - s2 %= BASE; - } - - return (s2 << 16) | s1; -} - static unsigned int hashbits(unsigned int size) { unsigned int val = 1, bits = 0; -- 2.30.2