In generate_files(), changed arg "f" to "f_out", as Chris Shoemaker
authorWayne Davison <wayned@samba.org>
Mon, 12 Jul 2004 20:42:48 +0000 (20:42 +0000)
committerWayne Davison <wayned@samba.org>
Mon, 12 Jul 2004 20:42:48 +0000 (20:42 +0000)
suggested.

generator.c

index 6b8a9a2de1748e0010b10f28f98764e6e569e1ca..0ece818cf12752a63a9af6da1f4b7b661cfdae4f 100644 (file)
@@ -543,7 +543,7 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 }
 
 
-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;
@@ -584,7 +584,7 @@ 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++;
@@ -594,21 +594,21 @@ void generate_files(int f, struct file_list *flist, char *local_name)
        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();