Correction from Nelson Beebe: argument to functions such as isspace()

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index ee34bc9..212ceba 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -28,9 +28,18 @@ extern int dry_run;
 extern int am_server;
 
 
-/*
-  receive the checksums for a buffer
-  */
+/**
+ * @file
+ *
+ * The sender gets checksums from the generator, calculates deltas,
+ * and transmits them to the receiver.  The sender process runs on the
+ * machine holding the source files.
+ **/
+
+
+/**
+ * Receive the checksums for a buffer
+ **/
 static struct sum_struct *receive_sums(int f)
 {
        struct sum_struct *s;
@@ -46,8 +55,8 @@ static struct sum_struct *receive_sums(int f)
        s->sums = NULL;
 
        if (verbose > 3)
-               rprintf(FINFO,"count=%d n=%d rem=%d\n",
-                       s->count,s->n,s->remainder);
+               rprintf(FINFO,"count=%ld n=%ld rem=%ld\n",
+                       (long) s->count, (long) s->n, (long) s->remainder);
 
        if (s->count == 0) 
                return(s);
@@ -55,14 +64,14 @@ static struct sum_struct *receive_sums(int f)
        s->sums = (struct sum_buf *)malloc(sizeof(s->sums[0])*s->count);
        if (!s->sums) out_of_memory("receive_sums");
 
-       for (i=0;i<s->count;i++) {
+       for (i=0; i < (int) s->count;i++) {
                s->sums[i].sum1 = read_int(f);
                read_buf(f,s->sums[i].sum2,csum_length);
 
                s->sums[i].offset = offset;
                s->sums[i].i = i;
 
-               if (i == s->count-1 && s->remainder != 0) {
+               if (i == (int) s->count-1 && s->remainder != 0) {
                        s->sums[i].len = s->remainder;
                } else {
                        s->sums[i].len = s->n;
@@ -159,13 +168,14 @@ void send_files(struct file_list *flist,int f_out,int f_in)
                initial_stats = stats;
 
                s = receive_sums(f_in);
-               if (write_batch) /* dw */
-                   write_batch_csum_info(&i,flist->count,s);
                if (!s) {
                        io_error = 1;
                        rprintf(FERROR,"receive_sums failed\n");
                        return;
                }
+
+               if (write_batch)
+                   write_batch_csum_info(&i,flist->count,s);
          
                if (!read_batch) {
                        fd = do_open(fname, O_RDONLY, 0);