configuration parsing and loading code for rsyncd. This is based

[rsync/rsync.git] / checksum.c

diff --git a/checksum.c b/checksum.c
index 6be1993..6dc935e 100644 (file)
--- a/checksum.c
+++ b/checksum.c
@@ -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;
+    schar *buf = (schar *)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] + 10;
-       s1 += (buf[i+0] + buf[i+1] + buf[i+2] + buf[i+3] + 4); 
+       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]+1); s2 += s1;
+       s1 += (buf[i]+CHAR_OFFSET); s2 += s1;
     }
     return (s1 & 0xffff) + (s2 << 16);
 }
@@ -63,8 +65,8 @@ void get_checksum2(char *buf,int len,char *sum)
 {
   int i;
   MDstruct MD;
-  static char *buf1 = NULL;
-  static int len1 = 0;
+  static char *buf1;
+  static int len1;
 
   if (len > len1) {
     if (buf1) free(buf1);
@@ -91,13 +93,13 @@ void get_checksum2(char *buf,int len,char *sum)
 }
 
 
-void file_checksum(char *fname,char *sum,off_t size)
+void file_checksum(char *fname,char *sum,OFF_T size)
 {
-  int i;
+  OFF_T i;
   MDstruct MD;
   struct map_struct *buf;
   int fd;
-  int len = size;
+  OFF_T len = size;
   char tmpchunk[CSUM_CHUNK];
 
   bzero(sum,csum_length);