Use "use warnings" rather than -w on the #! line.

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

diff --git a/log-checksum.diff b/log-checksum.diff
index b7ab815..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;
        }
  
@@ -72,7 +72,7 @@ diff --git a/log.c b/log.c
  extern int gid_ndx;
 @@ -57,6 +59,7 @@ extern iconv_t ic_send, ic_recv;
  extern char curr_dir[];
- extern char *module_dir;
+ extern char *full_module_path;
  extern unsigned int module_dirlen;
 +extern char sender_file_sum[MAX_DIGEST_LEN];
  
@@ -118,7 +118,7 @@ diff --git a/main.c b/main.c
  extern int remove_source_files;
  extern int need_messages_from_generator;
  extern int kluge_around_eof;
-@@ -71,6 +72,8 @@ extern int check_for_io_err;
+@@ -68,6 +69,8 @@ extern int connect_timeout;
  extern pid_t cleanup_child_pid;
  extern unsigned int module_dirlen;
  extern struct stats stats;
@@ -127,7 +127,7 @@ diff --git a/main.c b/main.c
  extern char *filesfrom_host;
  extern char *partial_dir;
  extern char *dest_option;
-@@ -88,6 +91,7 @@ int local_server = 0;
+@@ -85,6 +88,7 @@ int local_server = 0;
  int daemon_over_rsh = 0;
  mode_t orig_umask = 0;
  int batch_gen_fd = -1;
@@ -135,7 +135,7 @@ diff --git a/main.c b/main.c
  
  /* There's probably never more than at most 2 outstanding child processes,
   * but set it higher, just in case. */
-@@ -1008,6 +1012,12 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
+@@ -1003,6 +1007,12 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
  
        if (am_sender) {
                keep_dirlinks = 0; /* Must be disabled on the sender. */
@@ -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')
@@ -239,7 +239,7 @@ diff --git a/receiver.c b/receiver.c
  extern struct file_list *cur_flist, *first_flist, *dir_flist;
  extern struct filter_list_struct daemon_filter_list;
  
-@@ -165,10 +167,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+@@ -166,10 +168,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
                        const char *fname, int fd, OFF_T total_size)
  {
        static char file_sum1[MAX_DIGEST_LEN];
@@ -251,7 +251,7 @@ diff --git a/receiver.c b/receiver.c
        OFF_T offset = 0;
        OFF_T offset2;
        char *data;
-@@ -298,15 +299,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);
        }