[PATCH] [TRIVIAL] whitespace + variable rename

Chris Shoemaker c.shoemaker at cox.net
Sun Jul 11 15:39:53 GMT 2004


The attached patch adds some whitespace to the recv_files() function
declaration, and renames variable 'f' to 'f_out' in generate_files().
-------------- next part --------------
Index: generator.c
===================================================================
RCS file: /cvsroot/rsync/generator.c,v
retrieving revision 1.93
diff -b -c -r1.93 generator.c
*** generator.c	30 Jun 2004 07:27:30 -0000	1.93
--- generator.c	11 Jul 2004 20:24:21 -0000
***************
*** 543,549 ****
  }
  
  
! void generate_files(int f, struct file_list *flist, char *local_name)
  {
  	int i;
  	int phase = 0;
--- 545,551 ----
  }
  
  
! void generate_files(int f_out, struct file_list *flist, char *local_name)
  {
  	int i;
  	int phase = 0;
***************
*** 584,590 ****
  		}
  
  		recv_generator(local_name ? local_name : f_name_to(file, fbuf),
! 			       file, i, f);
  	}
  
  	phase++;
--- 586,592 ----
  		}
  
  		recv_generator(local_name ? local_name : f_name_to(file, fbuf),
! 			       file, i, f_out);
  	}
  
  	phase++;
***************
*** 594,614 ****
  	if (verbose > 2)
  		rprintf(FINFO,"generate_files phase=%d\n",phase);
  
! 	write_int(f,-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);
  	}
  
  	phase++;
  	if (verbose > 2)
  		rprintf(FINFO,"generate_files phase=%d\n",phase);
  
! 	write_int(f,-1);
  
  	if (preserve_hard_links)
  		do_hard_links();
--- 596,616 ----
  	if (verbose > 2)
  		rprintf(FINFO,"generate_files phase=%d\n",phase);
  
! 	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_out);
  	}
  
  	phase++;
  	if (verbose > 2)
  		rprintf(FINFO,"generate_files phase=%d\n",phase);
  
! 	write_int(f_out,-1);
  
  	if (preserve_hard_links)
  		do_hard_links();
Index: receiver.c
===================================================================
RCS file: /cvsroot/rsync/receiver.c,v
retrieving revision 1.86
diff -b -c -r1.86 receiver.c
*** receiver.c	2 Jul 2004 18:23:57 -0000	1.86
--- receiver.c	11 Jul 2004 20:24:22 -0000
***************
*** 289,295 ****
   * main routine for receiver process.
   *
   * Receiver process runs on the same host as the generator process. */
! int recv_files(int f_in,struct file_list *flist,char *local_name)
  {
  	int fd1,fd2;
  	STRUCT_STAT st;
--- 289,295 ----
   * main routine for receiver process.
   *
   * Receiver process runs on the same host as the generator process. */
! int recv_files(int f_in, struct file_list *flist, char *local_name)
  {
  	int fd1,fd2;
  	STRUCT_STAT st;


More information about the rsync mailing list