In generate_files(), changed arg "f" to "f_out", as Chris Shoemaker

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index 84958b8..0ece818 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -258,15 +258,16 @@ static void generate_and_send_sums(struct map_struct *buf, size_t len, int f_out
 
 
 
-/**
+/*
  * Acts on file number @p i from @p flist, whose name is @p fname.
  *
  * First fixes up permissions, then generates checksums for the file.
  *
  * @note This comment was added later by mbp who was trying to work it
  * out.  It might be wrong.
- **/
-void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
+ */
+static void recv_generator(char *fname, struct file_struct *file, int i,
+                          int f_out)
 {
        int fd;
        STRUCT_STAT st;
@@ -542,10 +543,10 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
 }
 
 
-void generate_files(int f, struct file_list *flist, char *local_name)
+void generate_files(int f_out, struct file_list *flist, char *local_name)
 {
        int i;
-       int phase=0;
+       int phase = 0;
        char fbuf[MAXPATHLEN];
 
        if (verbose > 2) {
@@ -583,31 +584,31 @@ void generate_files(int f, struct file_list *flist, char *local_name)
                }
 
                recv_generator(local_name ? local_name : f_name_to(file, fbuf),
-                              file, i, f);
+                              file, i, f_out);
        }
 
        phase++;
        csum_length = SUM_LENGTH;
-       ignore_times=1;
+       ignore_times = 1;
 
        if (verbose > 2)
                rprintf(FINFO,"generate_files phase=%d\n",phase);
 
-       write_int(f,-1);
+       write_int(f_out, -1);
 
        /* files can cycle through the system more than once
         * to catch initial checksum errors */
        while ((i = get_redo_num()) != -1) {
                struct file_struct *file = flist->files[i];
                recv_generator(local_name ? local_name : f_name_to(file, fbuf),
-                              file, i, f);
+                              file, i, f_out);
        }
 
        phase++;
        if (verbose > 2)
                rprintf(FINFO,"generate_files phase=%d\n",phase);
 
-       write_int(f,-1);
+       write_int(f_out, -1);
 
        if (preserve_hard_links)
                do_hard_links();