===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/telnet/utilities.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** src/usr.bin/telnet/utilities.c	2014/07/20 12:08:55	1.19
--- src/usr.bin/telnet/utilities.c	2014/07/22 07:30:24	1.20
***************
*** 1,4 ****
! /*	$OpenBSD: utilities.c,v 1.19 2014/07/20 12:08:55 guenther Exp $	*/
  /*	$NetBSD: utilities.c,v 1.5 1996/02/28 21:04:21 thorpej Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: utilities.c,v 1.20 2014/07/22 07:30:24 jsg Exp $	*/
  /*	$NetBSD: utilities.c,v 1.5 1996/02/28 21:04:21 thorpej Exp $	*/
  
  /*
***************
*** 68,76 ****
  
  unsigned char NetTraceFile[PATH_MAX] = "(standard output)";
  
!     void
! SetNetTrace(file)
!     char *file;
  {
      if (NetTrace && NetTrace != stdout)
  	fclose(NetTrace);
--- 68,75 ----
  
  unsigned char NetTraceFile[PATH_MAX] = "(standard output)";
  
! void
! SetNetTrace(char *file)
  {
      if (NetTrace && NetTrace != stdout)
  	fclose(NetTrace);
***************
*** 86,96 ****
      strlcpy((char *)NetTraceFile, "(standard output)", sizeof(NetTraceFile));
  }
  
!     void
! Dump(direction, buffer, length)
!     char direction;
!     unsigned char *buffer;
!     int length;
  {
  #   define BYTES_PER_LINE	32
  #   define min(x,y)	((x<y)? x:y)
--- 85,92 ----
      strlcpy((char *)NetTraceFile, "(standard output)", sizeof(NetTraceFile));
  }
  
! void
! Dump(char direction, unsigned char *buffer, int length)
  {
  #   define BYTES_PER_LINE	32
  #   define min(x,y)	((x<y)? x:y)
***************
*** 136,146 ****
      fflush(NetTrace);
  }
  
! 
! 	void
! printoption(direction, cmd, option)
! 	char *direction;
! 	int cmd, option;
  {
  	if (!showoptions)
  		return;
--- 132,139 ----
      fflush(NetTrace);
  }
  
! void
! printoption(char *direction, int cmd, int option)
  {
  	if (!showoptions)
  		return;
***************
*** 173,180 ****
  	return;
  }
  
!     void
! optionstatus()
  {
      int i;
  
--- 166,173 ----
  	return;
  }
  
! void
! optionstatus(void)
  {
      int i;
  
***************
*** 249,259 ****
  
  }
  
!     void
! printsub(direction, pointer, length)
!     char direction;	/* '<' or '>' */
!     unsigned char *pointer;	/* where suboption data sits */
!     int		  length;	/* length of suboption data */
  {
      int i;
  
--- 242,251 ----
  
  }
  
! void
! printsub(char direction,	/* '<' or '>' */
!     unsigned char *pointer,	/* where suboption data sits */
!     int length)			/* length of suboption data */
  {
      int i;
  
***************
*** 656,663 ****
   *			way to the kernel (thus the poll).
   */
  
!     void
! EmptyTerminal()
  {
      struct pollfd pfd[1];
  
--- 648,655 ----
   *			way to the kernel (thus the poll).
   */
  
! void
! EmptyTerminal(void)
  {
      struct pollfd pfd[1];
  
***************
*** 674,681 ****
      }
  }
  
!     void
! SetForExit()
  {
      setconnmode(0);
      do {
--- 666,673 ----
      }
  }
  
! void
! SetForExit(void)
  {
      setconnmode(0);
      do {
***************
*** 690,707 ****
      setcommandmode();
  }
  
!     void
! Exit(returnCode)
!     int returnCode;
  {
      SetForExit();
      exit(returnCode);
  }
  
!     void
! ExitString(string, returnCode)
!     char *string;
!     int returnCode;
  {
      SetForExit();
      fwrite(string, 1, strlen(string), stderr);
--- 682,696 ----
      setcommandmode();
  }
  
! void
! Exit(int returnCode)
  {
      SetForExit();
      exit(returnCode);
  }
  
! void
! ExitString(char *string, int returnCode)
  {
      SetForExit();
      fwrite(string, 1, strlen(string), stderr);