From: Tom Yu <tlyu@mit.edu>
Date: Sun, 2 Jul 1995 09:19:35 +0000 (+0000)
Subject: 	* commands.c: rename setmode() and clearmode() to tel_setmode()
X-Git-Tag: krb5-1.0-beta6~1598
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3366c9fe9c2199954d2a6e99774bd1c7d2d069e9;p=krb5.git

	* commands.c: rename setmode() and clearmode() to tel_setmode()
		and tel_clearmode() to avoid conflicts with setmode()
		defined in NetBSD unistd.h

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6217 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog
index 589c388b9..ac5507759 100644
--- a/src/appl/telnet/telnet/ChangeLog
+++ b/src/appl/telnet/telnet/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jul  2 04:19:48 1995  Tom Yu  <tlyu@lothlorien.MIT.EDU>
+
+	* commands.c: rename setmode() and clearmode() to tel_setmode()
+		and tel_clearmode() to avoid conflicts with setmode()
+		defined in NetBSD unistd.h
+
 Tue Jun 20 14:10:26 1995  Tom Yu  (tlyu@dragons-lair)
 
 	* externs.h: NO_STRING_H -> HAVE_STRING_H
diff --git a/src/appl/telnet/telnet/commands.c b/src/appl/telnet/telnet/commands.c
index 37beb63e2..a3e52f22a 100644
--- a/src/appl/telnet/telnet/commands.c
+++ b/src/appl/telnet/telnet/commands.c
@@ -1142,15 +1142,15 @@ dolmmode(bit, on)
     return 1;
 }
 
-    int
-setmode(bit)
+    static int
+tel_setmode(bit)
     int bit;
 {
     return dolmmode(bit, 1);
 }
 
-    int
-clearmode(bit)
+    static int
+tel_clearmode(bit)
     int bit;
 {
     return dolmmode(bit, 0);
@@ -1177,18 +1177,18 @@ static struct modelist ModeList[] = {
 #endif
     { "", "", 0 },
     { "",	"These require the LINEMODE option to be enabled", 0 },
-    { "isig",	"Enable signal trapping",	setmode, 1, MODE_TRAPSIG },
-    { "+isig",	0,				setmode, 1, MODE_TRAPSIG },
-    { "-isig",	"Disable signal trapping",	clearmode, 1, MODE_TRAPSIG },
-    { "edit",	"Enable character editing",	setmode, 1, MODE_EDIT },
-    { "+edit",	0,				setmode, 1, MODE_EDIT },
-    { "-edit",	"Disable character editing",	clearmode, 1, MODE_EDIT },
-    { "softtabs", "Enable tab expansion",	setmode, 1, MODE_SOFT_TAB },
-    { "+softtabs", 0,				setmode, 1, MODE_SOFT_TAB },
-    { "-softtabs", "Disable character editing",	clearmode, 1, MODE_SOFT_TAB },
-    { "litecho", "Enable literal character echo", setmode, 1, MODE_LIT_ECHO },
-    { "+litecho", 0,				setmode, 1, MODE_LIT_ECHO },
-    { "-litecho", "Disable literal character echo", clearmode, 1, MODE_LIT_ECHO },
+    { "isig",	"Enable signal trapping",	tel_setmode, 1, MODE_TRAPSIG },
+    { "+isig",	0,				tel_setmode, 1, MODE_TRAPSIG },
+    { "-isig",	"Disable signal trapping",	tel_clearmode, 1, MODE_TRAPSIG },
+    { "edit",	"Enable character editing",	tel_setmode, 1, MODE_EDIT },
+    { "+edit",	0,				tel_setmode, 1, MODE_EDIT },
+    { "-edit",	"Disable character editing",	tel_clearmode, 1, MODE_EDIT },
+    { "softtabs", "Enable tab expansion",	tel_setmode, 1, MODE_SOFT_TAB },
+    { "+softtabs", 0,				tel_setmode, 1, MODE_SOFT_TAB },
+    { "-softtabs", "Disable character editing",	tel_clearmode, 1, MODE_SOFT_TAB },
+    { "litecho", "Enable literal character echo", tel_setmode, 1, MODE_LIT_ECHO },
+    { "+litecho", 0,				tel_setmode, 1, MODE_LIT_ECHO },
+    { "-litecho", "Disable literal character echo", tel_clearmode, 1, MODE_LIT_ECHO },
     { "help",	0,				modehelp, 0 },
 #ifdef	KLUDGELINEMODE
     { "kludgeline", 0,				dokludgemode, 1 },