===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/telnet/commands.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -c -r1.65 -r1.66
*** src/usr.bin/telnet/commands.c	2014/07/20 09:59:42	1.65
--- src/usr.bin/telnet/commands.c	2014/07/20 10:18:10	1.66
***************
*** 1,4 ****
! /*	$OpenBSD: commands.c,v 1.65 2014/07/20 09:59:42 guenther Exp $	*/
  /*	$NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: commands.c,v 1.66 2014/07/20 10:18:10 guenther Exp $	*/
  /*	$NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $	*/
  
  /*
***************
*** 347,353 ****
  	if ((s = GETSEND(argv[i])) == 0) {
  	    fprintf(stderr, "Telnet 'send' error - argument disappeared!\r\n");
  	    quit();
- 	    /*NOTREACHED*/
  	}
  	if (s->handler) {
  	    count++;
--- 347,352 ----
***************
*** 1249,1255 ****
  	return 1;
  }
  
-     /*VARARGS*/
      static int
  togcrmod()
  {
--- 1248,1253 ----
***************
*** 1260,1266 ****
      return 1;
  }
  
-     /*VARARGS*/
      int
  telnetsuspend()
  {
--- 1258,1263 ----
***************
*** 1286,1292 ****
      return 1;
  }
  
-     /*ARGSUSED*/
      int
  shell(argc, argv)
      int argc;
--- 1283,1288 ----
***************
*** 1335,1341 ****
      return 1;
  }
  
-     /*VARARGS*/
      static int
  bye(argc, argv)
      int  argc;		/* Number of arguments */
--- 1331,1336 ----
***************
*** 1352,1362 ****
  	/* reset options */
  	tninit();
      }
!     if ((argc != 2) || (strcmp(argv[1], "fromquit") != 0)) {
  	longjmp(toplevel, 1);
! 	/* NOTREACHED */
!     }
!     return 0; /* NOTREACHED */
  }
  
  void
--- 1347,1355 ----
  	/* reset options */
  	tninit();
      }
!     if ((argc != 2) || (strcmp(argv[1], "fromquit") != 0))
  	longjmp(toplevel, 1);
!     return 0;
  }
  
  void
***************
*** 1372,1378 ****
  	quit();
  }
  
- /*VARARGS*/
  	static int
  logout()
  {
--- 1365,1370 ----
***************
*** 1762,1768 ****
  /*
   * Print status about the connection.
   */
-     /*ARGSUSED*/
      static int
  status(argc, argv)
      int	 argc;
--- 1754,1759 ----
***************
*** 2120,2127 ****
  	telnet(user);
      (void) NetClose(net);
      ExitString("Connection closed by foreign host.\r\n",1);
-     /*NOTREACHED*/
-     return 0;
  }
  
  #define HELPINDENT (sizeof ("connect"))
--- 2111,2116 ----
***************
*** 2248,2257 ****
  	    if (rlogin != _POSIX_VDISABLE)
  		printf("%s> ", prompt);
  	    if (fgets(line, sizeof(line), stdin) == NULL) {
! 		if (feof(stdin) || ferror(stdin)) {
  		    quit();
- 		    /*NOTREACHED*/
- 		}
  		break;
  	    }
  	}
--- 2237,2244 ----
  	    if (rlogin != _POSIX_VDISABLE)
  		printf("%s> ", prompt);
  	    if (fgets(line, sizeof(line), stdin) == NULL) {
! 		if (feof(stdin) || ferror(stdin))
  		    quit();
  		break;
  	    }
  	}
***************
*** 2279,2288 ****
  	}
      }
      if (!top) {
! 	if (!connected) {
  	    longjmp(toplevel, 1);
- 	    /*NOTREACHED*/
- 	}
  	setconnmode(0);
      }
  }
--- 2266,2273 ----
  	}
      }
      if (!top) {
! 	if (!connected)
  	    longjmp(toplevel, 1);
  	setconnmode(0);
      }
  }