Now support dynamic per-file checksum2 size.

[rsync/rsync.git] / checksum.c

diff --git a/checksum.c b/checksum.c
index edc844f..8e584fa 100644 (file)
--- a/checksum.c
+++ b/checksum.c
@@ -91,9 +91,9 @@ void file_checksum(char *fname,char *sum,OFF_T size)
        char tmpchunk[CSUM_CHUNK];
        struct mdfour m;
        
-       memset(sum,0,csum_length);
+       memset(sum,0,MD4_SUM_LENGTH);
        
-       fd = open(fname,O_RDONLY);
+       fd = do_open(fname, O_RDONLY, 0);
        if (fd == -1) return;
        
        buf = map_file(fd,size);
@@ -117,16 +117,6 @@ void file_checksum(char *fname,char *sum,OFF_T size)
 }
 
 
-void checksum_init(void)
-{
-  if (remote_version >= 14)
-    csum_length = 2; /* adaptive */
-  else
-    csum_length = SUM_LENGTH;
-}
-
-
-
 static int sumresidue;
 static char sumrbuf[CSUM_CHUNK];
 static struct mdfour md;
@@ -140,7 +130,15 @@ void sum_init(void)
        sum_update(s,4);
 }
 
-void sum_update(char *p,int len)
+/**
+ * Feed data into an MD4 accumulator, md.  The results may be
+ * retrieved using sum_end().  md is used for different purposes at
+ * different points during execution.
+ *
+ * @todo Perhaps get rid of md and just pass in the address each time.
+ * Very slightly clearer and slower.
+ **/
+void sum_update(char *p, int len)
 {
        int i;
        if (len + sumresidue < CSUM_CHUNK) {