From 112a50cd56933c05d8188533b4005028b114ab95 Mon Sep 17 00:00:00 2001
From: markm <markm@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Wed, 25 Sep 2002 07:26:25 +0000
Subject: [PATCH] Catch up with "base" telnet.

s/FALL THROUGH/FALLTHROUGH/ for lint(1).
s/Usage/usage/ for consistency.


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@103955 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 telnet/commands.c |  2 +-
 telnet/main.c     |  6 +-----
 telnet/telnet.c   | 12 ++++++------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/telnet/commands.c b/telnet/commands.c
index bdec69b..fa53199 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -453,7 +453,7 @@ send_tncmd(void (*func)(int, int), const char *cmd, char *name)
     if (isprefix(name, "help") || isprefix(name, "?")) {
 	int col, len;
 
-	printf("Usage: send %s <value|option>\n", cmd);
+	printf("usage: send %s <value|option>\n", cmd);
 	printf("\"value\" must be from 0 to 255\n");
 	printf("Valid options are:\n\t");
 
diff --git a/telnet/main.c b/telnet/main.c
index af58d32..1e973b4 100644
--- a/telnet/main.c
+++ b/telnet/main.c
@@ -61,10 +61,6 @@ static const char sccsid[] = "@(#)main.c	8.3 (Berkeley) 5/30/95";
 #define OPTS_FORWARD_CREDS	0x00000002
 #define OPTS_FORWARDABLE_CREDS	0x00000001
 
-#if 0
-#define FORWARD
-#endif
-
 #if defined(IPSEC) && defined(IPSEC_POLICY_IPSEC)
 char *ipsec_policy_in = NULL;
 char *ipsec_policy_out = NULL;
@@ -90,7 +86,7 @@ tninit(void)
 static void
 usage(void)
 {
-	fprintf(stderr, "Usage: %s %s%s%s%s\n",
+	fprintf(stderr, "usage: %s %s%s%s%s\n",
 	    prompt,
 #ifdef	AUTHENTICATION
 	    "[-4] [-6] [-8] [-E] [-K] [-L] [-N] [-S tos] [-X atype] [-c] [-d]",
diff --git a/telnet/telnet.c b/telnet/telnet.c
index 4644531..ab0faf4 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -286,7 +286,7 @@ willoption(int option)
 	    case TELOPT_BINARY:
 	    case TELOPT_SGA:
 		settimer(modenegotiated);
-		/* FALL THROUGH */
+		/* FALLTHROUGH */
 	    case TELOPT_STATUS:
 #ifdef	AUTHENTICATION
 	    case TELOPT_AUTHENTICATION:
@@ -346,7 +346,7 @@ wontoption(int option)
 	    case TELOPT_SGA:
 		if (!kludgelinemode)
 		    break;
-		/* FALL THROUGH */
+		/* FALLTHROUGH */
 #endif
 	    case TELOPT_ECHO:
 		settimer(modenegotiated);
@@ -1418,7 +1418,7 @@ env_opt(unsigned char *buf, int len)
 					old_env_var = OLD_ENV_VAR;
 					old_env_value = OLD_ENV_VALUE;
 				}
-				/* FALL THROUGH */
+				/* FALLTHROUGH */
 # endif
 			case OLD_ENV_VALUE:
 				/*
@@ -1426,7 +1426,7 @@ env_opt(unsigned char *buf, int len)
 				 * still recognize it, just in case it is an
 				 * old server that has VAR & VALUE mixed up...
 				 */
-				/* FALL THROUGH */
+				/* FALLTHROUGH */
 #else
 			case NEW_ENV_VAR:
 #endif
@@ -1439,7 +1439,7 @@ env_opt(unsigned char *buf, int len)
 				break;
 			case ENV_ESC:
 				i++;
-				/*FALL THROUGH*/
+				/*FALLTHROUGH*/
 			default:
 				if (epc)
 					*epc++ = buf[i];
@@ -1648,7 +1648,7 @@ telrcv(void)
 		TTYADD(c);
 		break;
 	    }
-	    /* Else, fall through */
+	    /* FALLTHROUGH */
 
 	case TS_DATA:
 	    if (c == IAC) {