The patches for 3.0.5pre2.

[rsync/rsync-patches.git] / log-checksum.diff

diff --git a/log-checksum.diff b/log-checksum.diff
index 38475b3..627d13d 100644 (file)
--- a/log-checksum.diff
+++ b/log-checksum.diff
@@ -46,7 +46,7 @@ diff --git a/flist.c b/flist.c
        if (am_sender)
                F_PATHNAME(file) = pathname;
        else if (!pool)
-@@ -1319,6 +1323,9 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -1300,6 +1304,9 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
                return NULL;
        }
  
@@ -210,7 +210,7 @@ diff --git a/match.c b/match.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -1524,7 +1524,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1525,7 +1525,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                else if (log_format_has(stdout_format, 'i'))
                        stdout_format_has_i = itemize_changes | 1;
                if (!log_format_has(stdout_format, 'b')
@@ -251,7 +251,7 @@ diff --git a/receiver.c b/receiver.c
        OFF_T offset = 0;
        OFF_T offset2;
        char *data;
-@@ -299,15 +300,16 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+@@ -302,15 +303,16 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
                exit_cleanup(RERR_FILEIO);
        }