Call log_item() instead of log_send().

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index b745f6f..b08437d 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -35,6 +35,7 @@ extern int make_backups;
 extern int do_progress;
 extern int inplace;
 extern struct stats stats;
+extern struct file_list *the_file_list;
 extern char *log_format;
 
 
@@ -99,18 +100,16 @@ static struct sum_struct *receive_sums(int f)
        return s;
 }
 
-static struct file_list *the_flist;
-
-void successful_send(int i)
+void successful_send(int ndx)
 {
        char fname[MAXPATHLEN];
        struct file_struct *file;
        unsigned int offset;
 
-       if (!the_flist || i < 0 || i >= the_flist->count)
+       if (ndx < 0 || ndx >= the_file_list->count)
                return;
 
-       file = the_flist->files[i];
+       file = the_file_list->files[ndx];
        /* The generator might tell us about symlinks we didn't send. */
        if (!(file->flags & FLAG_SENT) && !S_ISLNK(file->mode))
                return;
@@ -145,8 +144,6 @@ void send_files(struct file_list *flist, int f_out, int f_in)
        if (verbose > 2)
                rprintf(FINFO, "send_files starting\n");
 
-       the_flist = flist;
-
        while (1) {
                unsigned int offset;
 
@@ -200,11 +197,11 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                                write_shortint(f_out, iflags);
                                if (am_server) {
                                        if (am_daemon && !dry_run && see_item)
-                                               log_send(file, &stats, iflags);
+                                               log_item(file, &stats, iflags, NULL);
                                } else if (see_item || iflags & ITEM_UPDATING
                                    || (S_ISDIR(file->mode)
                                     && iflags & ITEM_REPORT_TIME))
-                                       log_send(file, &stats, iflags);
+                                       log_item(file, &stats, iflags, NULL);
                                continue;
                        }
                } else
@@ -227,7 +224,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 
                if (dry_run) { /* log the transfer */
                        if (!am_server && log_format)
-                               log_send(file, &stats, iflags);
+                               log_item(file, &stats, iflags, NULL);
                        write_int(f_out, i);
                        if (protocol_version >= 29)
                                write_shortint(f_out, iflags);
@@ -292,7 +289,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                }
 
                if (log_before_transfer)
-                       log_send(file, &initial_stats, iflags);
+                       log_item(file, &initial_stats, iflags, NULL);
                else if (!am_server && verbose && do_progress)
                        rprintf(FINFO, "%s\n", safe_fname(fname2));
 
@@ -300,7 +297,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 
                match_sums(f_out, s, mbuf, st.st_size);
                if (!log_before_transfer)
-                       log_send(file, &initial_stats, iflags);
+                       log_item(file, &initial_stats, iflags, NULL);
 
                if (mbuf) {
                        j = unmap_file(mbuf);