Add a little more protocol documentation.

[rsync/rsync.git] / io.c

diff --git a/io.c b/io.c
index 649bd75..dac0744 100644 (file)
--- a/io.c
+++ b/io.c
@@ -181,8 +181,8 @@ static int read_timeout(int fd, char *buf, int len)
                        if (eof_error) {
                                rprintf(FERROR,
                                         "%s: connection to server unexpectedly closed"
-                                        " (%ld bytes read so far)\n",
-                                        RSYNC_NAME, stats.total_read);
+                                        " (%.0f bytes read so far)\n",
+                                        RSYNC_NAME, (double)stats.total_read);
                        }
                        exit_cleanup(RERR_STREAMIO);
                }
@@ -381,7 +381,6 @@ static void writefd_unbuffered(int fd,char *buf,int len)
 
                if (FD_ISSET(fd, &w_fds)) {
                        int ret, n = len-total;
-                       
                        ret = write(fd,buf+total,n);
 
                        if (ret == -1 && errno == EINTR) {
@@ -490,18 +489,6 @@ void io_end_buffering(int fd)
        }
 }
 
-/* some OSes have a bug where an exit causes the pending writes on
-   a socket to be flushed. Do an explicit shutdown to try to prevent this */
-void io_shutdown(void)
-{
-       err_list_push();
-       if (multiplex_out_fd != -1) close(multiplex_out_fd);
-       if (io_error_fd != -1) close(io_error_fd);
-       multiplex_out_fd = -1;
-       io_error_fd = -1;
-}
-
-
 static void writefd(int fd,char *buf,int len)
 {
        stats.total_written += len;
@@ -608,7 +595,7 @@ void io_printf(int fd, const char *format, ...)
        int len;
        
        va_start(ap, format);
-       len = vslprintf(buf, sizeof(buf), format, ap);
+       len = vsnprintf(buf, sizeof(buf), format, ap);
        va_end(ap);
 
        if (len < 0) exit_cleanup(RERR_STREAMIO);