X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f94e821c782952437d7fe5a2ae1e0b1db8a4f4ab..feaa89c410544775afc19eac4a966e8345d5134a:/checksum.c diff --git a/checksum.c b/checksum.c index 1fd1c55c..7b8035cc 100644 --- a/checksum.c +++ b/checksum.c @@ -19,7 +19,7 @@ #include "rsync.h" -int csum_length=SUM_LENGTH; +int csum_length=2; /* initial value */ #define CSUM_CHUNK 64 @@ -30,18 +30,20 @@ extern int remote_version; a simple 32 bit checksum that can be upadted from either end (inspired by Mark Adler's Adler-32 checksum) */ -uint32 get_checksum1(char *buf,int len) +uint32 get_checksum1(char *buf1,int len) { int i; uint32 s1, s2; + signed char *buf = (signed char *)buf1; s1 = s2 = 0; for (i = 0; i < (len-4); i+=4) { - s2 += 4*(s1 + buf[i]) + 3*buf[i+1] + 2*buf[i+2] + buf[i+3]; - s1 += (buf[i+0] + buf[i+1] + buf[i+2] + buf[i+3]); + s2 += 4*(s1 + buf[i]) + 3*buf[i+1] + 2*buf[i+2] + buf[i+3] + + 10*CHAR_OFFSET; + s1 += (buf[i+0] + buf[i+1] + buf[i+2] + buf[i+3] + 4*CHAR_OFFSET); } for (; i < len; i++) { - s1 += buf[i]; s2 += s1; + s1 += (buf[i]+CHAR_OFFSET); s2 += s1; } return (s1 & 0xffff) + (s2 << 16); }