kfixed char* casts

[rsync/rsync.git] / io.c

diff --git a/io.c b/io.c
index 70c6a22..aafaeb3 100644 (file)
--- a/io.c
+++ b/io.c
@@ -281,7 +281,9 @@ int64 read_longint(int f)
        char b[8];
        ret = read_int(f);
 
-       if ((int32)ret != (int32)0xffffffff) return ret;
+       if ((int32)ret != (int32)0xffffffff) {
+               return ret;
+       }
 
 #ifdef NO_INT64
        rprintf(FERROR,"Integer overflow - attempted 64 bit offset\n");
@@ -337,8 +339,7 @@ static void writefd_unbuffered(int fd,char *buf,int len)
                fd_count = fd+1;
 
                if (!no_flush_read) {
-                       reading = (buffer_f_in != -1 && 
-                                  read_buffer_len < MAX_READ_BUFFER);
+                       reading = (buffer_f_in != -1);
                }
 
                if (reading) {
@@ -472,7 +473,7 @@ void write_longint(int f, int64 x)
                return;
        }
 
-       write_int(f, -1);
+       write_int(f, (int32)0xFFFFFFFF);
        SIVAL(b,0,(x&0xFFFFFFFF));
        SIVAL(b,4,((x>>32)&0xFFFFFFFF));
 
@@ -485,7 +486,7 @@ void write_buf(int f,char *buf,int len)
 }
 
 /* write a string to the connection */
-void write_sbuf(int f,char *buf)
+static void write_sbuf(int f,char *buf)
 {
        write_buf(f, buf, strlen(buf));
 }