From: Wayne Davison <wayned@samba.org>
Date: Mon, 12 Jul 2004 20:42:48 +0000 (+0000)
Subject: In generate_files(), changed arg "f" to "f_out", as Chris Shoemaker
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/7daccb8e72d650229062a1622c9551893feef9b3?hp=bb91a624f1f38f4e06ce61901dda54c2ffc52705

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

diff --git a/generator.c b/generator.c
index 6b8a9a2d..0ece818c 100644
--- a/generator.c
+++ b/generator.c
@@ -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();