===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/checkout.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -c -r1.155 -r1.156
*** src/usr.bin/cvs/checkout.c	2008/06/14 04:34:08	1.155
--- src/usr.bin/cvs/checkout.c	2008/07/08 12:29:58	1.156
***************
*** 1,4 ****
! /*	$OpenBSD: checkout.c,v 1.155 2008/06/14 04:34:08 tobias Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: checkout.c,v 1.156 2008/07/08 12:29:58 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
***************
*** 455,461 ****
  {
  	BUF *bp;
  	mode_t mode;
! 	int cf_kflag, exists, fd;
  	time_t rcstime;
  	CVSENTRIES *ent;
  	struct timeval tv[2];
--- 455,461 ----
  {
  	BUF *bp;
  	mode_t mode;
! 	int cf_kflag, exists;
  	time_t rcstime;
  	CVSENTRIES *ent;
  	struct timeval tv[2];
***************
*** 581,587 ****
  			(void)unlink(cf->file_path);
  			cvs_merge_file(cf, (cvs_join_rev1 == NULL));
  			tosend = cf->file_path;
- 			fd = cf->fd;
  		}
  
  		if (co_flags & CO_COMMIT)
--- 581,586 ----
***************
*** 603,609 ****
  				cvs_remote_send_file_buf(cf->file_path,
  				    bp, mode);
  			} else {
! 				cvs_remote_send_file(tosend, fd);
  			}
  		}
  	}
--- 602,608 ----
  				cvs_remote_send_file_buf(cf->file_path,
  				    bp, mode);
  			} else {
! 				cvs_remote_send_file(tosend, cf->fd);
  			}
  		}
  	}