===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/ftp.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -c -r1.39 -r1.40
*** src/usr.bin/ftp/ftp.c	2000/10/18 06:53:24	1.39
--- src/usr.bin/ftp/ftp.c	2001/06/23 22:48:44	1.40
***************
*** 1,4 ****
! /*	$OpenBSD: ftp.c,v 1.39 2000/10/18 06:53:24 itojun Exp $	*/
  /*	$NetBSD: ftp.c,v 1.27 1997/08/18 10:20:23 lukem Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: ftp.c,v 1.40 2001/06/23 22:48:44 millert Exp $	*/
  /*	$NetBSD: ftp.c,v 1.27 1997/08/18 10:20:23 lukem Exp $	*/
  
  /*
***************
*** 67,73 ****
  #if 0
  static char sccsid[] = "@(#)ftp.c	8.6 (Berkeley) 10/27/94";
  #else
! static char rcsid[] = "$OpenBSD: ftp.c,v 1.39 2000/10/18 06:53:24 itojun Exp $";
  #endif
  #endif /* not lint */
  
--- 67,73 ----
  #if 0
  static char sccsid[] = "@(#)ftp.c	8.6 (Berkeley) 10/27/94";
  #else
! static char rcsid[] = "$OpenBSD: ftp.c,v 1.40 2001/06/23 22:48:44 millert Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 507,529 ****
  {
  	struct stat st;
  	int c, d;
! 	FILE *fin, *dout;
! 	int (*closefunc) __P((FILE *));
! 	sig_t oldinti, oldintr, oldintp;
  	volatile off_t hashbytes;
! 	char *lmode, buf[BUFSIZ], *bufp;
  	int oprogress;
  
- #ifdef __GNUC__				/* XXX: to shut up gcc warnings */
- 	(void)&fin;
- 	(void)&dout;
- 	(void)&closefunc;
- 	(void)&oldinti;
- 	(void)&oldintr;
- 	(void)&oldintp;
- 	(void)&lmode;
- #endif
- 
  	hashbytes = mark;
  	direction = "sent";
  	dout = NULL;
--- 507,520 ----
  {
  	struct stat st;
  	int c, d;
! 	FILE * volatile fin, * volatile dout;
! 	int (* volatile closefunc) __P((FILE *));
! 	volatile sig_t oldinti, oldintr, oldintp;
  	volatile off_t hashbytes;
! 	char * volatile lmode;
! 	char buf[BUFSIZ], *bufp;
  	int oprogress;
  
  	hashbytes = mark;
  	direction = "sent";
  	dout = NULL;
***************
*** 806,817 ****
  
  void
  recvrequest(cmd, local, remote, lmode, printnames, ignorespecial)
! 	const char *cmd, *local, *remote, *lmode;
  	int printnames, ignorespecial;
  {
! 	FILE *fout, *din;
! 	int (*closefunc) __P((FILE *));
! 	sig_t oldinti, oldintr, oldintp;
  	int c, d;
  	volatile int is_retr, tcrflag, bare_lfs;
  	static size_t bufsize;
--- 797,808 ----
  
  void
  recvrequest(cmd, local, remote, lmode, printnames, ignorespecial)
! 	const char *cmd, * volatile local, *remote, *lmode;
  	int printnames, ignorespecial;
  {
! 	FILE * volatile fout, * volatile din;
! 	int (* volatile closefunc) __P((FILE *));
! 	volatile sig_t oldinti, oldintr, oldintp;
  	int c, d;
  	volatile int is_retr, tcrflag, bare_lfs;
  	static size_t bufsize;
***************
*** 822,837 ****
  	int oprogress;
  	int opreserve;
  
- #ifdef __GNUC__				/* XXX: to shut up gcc warnings */
- 	(void)&local;
- 	(void)&fout;
- 	(void)&din;
- 	(void)&closefunc;
- 	(void)&oldinti;
- 	(void)&oldintr;
- 	(void)&oldintp;
- #endif
- 
  	fout = NULL;
  	din = NULL;
  	oldinti = NULL;
--- 813,818 ----
***************
*** 1723,1738 ****
  proxtrans(cmd, local, remote)
  	const char *cmd, *local, *remote;
  {
! 	sig_t oldintr;
  	int prox_type, nfnd;
  	volatile int secndflag;
! 	char *cmd2;
  	fd_set mask;
- 
- #ifdef __GNUC__				/* XXX: to shut up gcc warnings */
- 	(void)&oldintr;
- 	(void)&cmd2;
- #endif
  
  	oldintr = NULL;
  	secndflag = 0;
--- 1704,1714 ----
  proxtrans(cmd, local, remote)
  	const char *cmd, *local, *remote;
  {
! 	volatile sig_t oldintr;
  	int prox_type, nfnd;
  	volatile int secndflag;
! 	char * volatile cmd2;
  	fd_set mask;
  
  	oldintr = NULL;
  	secndflag = 0;