Tweaked one or more warning messages.

[rsync/rsync.git] / io.c

diff --git a/io.c b/io.c
index 762cf81..828f552 100644 (file)
--- a/io.c
+++ b/io.c
@@ -149,7 +149,7 @@ static void check_timeout(void)
 
        if (t - last_io >= io_timeout) {
                if (!am_server && !am_daemon) {
-                       rprintf(FERROR, "io timeout after %d seconds - exiting\n",
+                       rprintf(FERROR, "io timeout after %d seconds -- exiting\n",
                                (int)(t-last_io));
                }
                exit_cleanup(RERR_TIMEOUT);
@@ -750,14 +750,13 @@ int64 read_longint(int f)
        if ((int32)ret != (int32)0xffffffff)
                return ret;
 
-#ifdef INT64_IS_OFF_T
-       if (sizeof (int64) < 8) {
-               rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n");
-               exit_cleanup(RERR_UNSUPPORTED);
-       }
-#endif
+#if SIZEOF_INT64 < 8
+       rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n");
+       exit_cleanup(RERR_UNSUPPORTED);
+#else
        readfd(f,b,8);
        ret = IVAL(b,0) | (((int64)IVAL(b,4))<<32);
+#endif
 
        return ret;
 }
@@ -804,6 +803,23 @@ void read_sum_head(int f, struct sum_struct *sum)
        }
 }
 
+/* Send the values from a sum_struct over the socket.  Set sum to
+ * NULL if there are no checksums to send.  This is called by both
+ * the generator and the sender. */
+void write_sum_head(int f, struct sum_struct *sum)
+{
+       static struct sum_struct null_sum;
+
+       if (sum == NULL)
+               sum = &null_sum;
+
+       write_int(f, sum->count);
+       write_int(f, sum->blength);
+       if (protocol_version >= 27)
+               write_int(f, sum->s2length);
+       write_int(f, sum->remainder);
+}
+
 
 /**
  * Sleep after writing to limit I/O bandwidth usage.
@@ -1067,18 +1083,16 @@ void write_longint(int f, int64 x)
                return;
        }
 
-#ifdef INT64_IS_OFF_T
-       if (sizeof (int64) < 8) {
-               rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n");
-               exit_cleanup(RERR_UNSUPPORTED);
-       }
-#endif
-
+#if SIZEOF_INT64 < 8
+       rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n");
+       exit_cleanup(RERR_UNSUPPORTED);
+#else
        write_int(f, (int32)0xFFFFFFFF);
        SIVAL(b,0,(x&0xFFFFFFFF));
        SIVAL(b,4,((x>>32)&0xFFFFFFFF));
 
        writefd(f,b,8);
+#endif
 }
 
 void write_buf(int f,char *buf,size_t len)