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 <s022018@student.dtu.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
Peter Eriksen committed
Feb 4, 2006 at 23:54 UTC
04fe2a1706b4bd71b604bfe7d7295064440872cf
1 file changed
+1
-38
diff-delta.c
+1
-38
@@ -20,6 +20,7 @@
20
21
#include <stdlib.h>
22
#include "delta.h"
23
+#include "zlib.h"
24
25
26
/* block size: min = 16, max = 64k, power of 2 */
@@ -30,44 +31,6 @@
31
#define GR_PRIME 0x9e370001
32
#define HASH(v, b) (((unsigned int)(v) * GR_PRIME) >> (32 - (b)))
33
33
-/* largest prime smaller than 65536 */
34
-#define BASE 65521
35
-
36
-/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
37
-#define NMAX 5552
38
-
39
-#define DO1(buf, i) { s1 += buf[i]; s2 += s1; }
40
-#define DO2(buf, i) DO1(buf, i); DO1(buf, i + 1);
41
-#define DO4(buf, i) DO2(buf, i); DO2(buf, i + 2);
42
-#define DO8(buf, i) DO4(buf, i); DO4(buf, i + 4);
43
-#define DO16(buf) DO8(buf, 0); DO8(buf, 8);
44
-
45
-static unsigned int adler32(unsigned int adler, const unsigned char *buf, int len)
46
-{
47
- int k;
48
- unsigned int s1 = adler & 0xffff;
49
- unsigned int s2 = adler >> 16;
50
-
51
- while (len > 0) {
52
- k = MIN(len, NMAX);
53
- len -= k;
54
- while (k >= 16) {
55
- DO16(buf);
56
- buf += 16;
57
- k -= 16;
58
- }
59
- if (k != 0)
60
- do {
61
- s1 += *buf++;
62
- s2 += s1;
63
- } while (--k);
64
- s1 %= BASE;
65
- s2 %= BASE;
66
- }
67
-
68
- return (s2 << 16) | s1;
69
-}
70
-
34
static unsigned int hashbits(unsigned int size)
35
{
36
unsigned int val = 1, bits = 0;