===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tftp/tftpsubs.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/tftp/tftpsubs.c	2001/11/19 19:02:16	1.3
--- src/usr.bin/tftp/tftpsubs.c	2002/09/06 18:55:04	1.4
***************
*** 1,4 ****
! /*	$OpenBSD: tftpsubs.c,v 1.3 2001/11/19 19:02:16 mpech Exp $	*/
  /*	$NetBSD: tftpsubs.c,v 1.3 1994/12/08 09:51:31 jtc Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: tftpsubs.c,v 1.4 2002/09/06 18:55:04 deraadt Exp $	*/
  /*	$NetBSD: tftpsubs.c,v 1.3 1994/12/08 09:51:31 jtc Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)tftpsubs.c	8.1 (Berkeley) 6/6/93";
  #endif
! static char rcsid[] = "$OpenBSD: tftpsubs.c,v 1.3 2001/11/19 19:02:16 mpech Exp $";
  #endif /* not lint */
  
  /* Simple minded read-ahead/write-behind subroutines for tftp user and
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)tftpsubs.c	8.1 (Berkeley) 6/6/93";
  #endif
! static char rcsid[] = "$OpenBSD: tftpsubs.c,v 1.4 2002/09/06 18:55:04 deraadt Exp $";
  #endif /* not lint */
  
  /* Simple minded read-ahead/write-behind subroutines for tftp user and
***************
*** 263,269 ****
  	int i, j = 0;
  	char rbuf[PKTSIZE];
  	struct sockaddr_in from;
! 	int fromlen;
  
  	while (1) {
  		(void) ioctl(f, FIONREAD, &i);
--- 263,269 ----
  	int i, j = 0;
  	char rbuf[PKTSIZE];
  	struct sockaddr_in from;
! 	socklen_t fromlen;
  
  	while (1) {
  		(void) ioctl(f, FIONREAD, &i);