- Use write_shortint() to send the 2 bytes in an extended flag.

[rsync/rsync.git] / receiver.c

diff --git a/receiver.c b/receiver.c
index 4ac407f..28eec5f 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -82,7 +82,7 @@ static int updating_basis;
  *   As long as it's unique, rsync will work.
  */
 
-static int get_tmpname(char *fnametmp, char *fname)
+int get_tmpname(char *fnametmp, char *fname)
 {
        int maxname, added, length = 0;
        char *f;
@@ -164,7 +164,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
                        offset = j;
                }
                if (offset < sum.flength) {
-                       int32 len = sum.flength - offset;
+                       int32 len = (int32)(sum.flength - offset);
                        if (do_progress)
                                show_progress(offset, total_size);
                        sum_update(map_ptr(mapbuf, offset, len), len);
@@ -660,7 +660,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
                                send_msg(MSG_SUCCESS, numbuf, 4);
                        }
                } else if (!recv_ok) {
-                       int msgtype = phase || read_batch ? FERROR : FINFO;
+                       enum logcode msgtype = phase || read_batch ? FERROR : FINFO;
                        if (msgtype == FERROR || verbose) {
                                char *errstr, *redostr, *keptstr;
                                if (!(keep_partial && partialptr) && !inplace)