From 65d1958a9b0e75fa175bd54de7b802d142bd9dd5 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Sun, 4 May 1997 09:53:15 +0000
Subject: [PATCH] rename ispeed and ospeed to handle netbsd

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1664 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/telnet/telnet/externs.h |  2 +-
 appl/telnet/telnet/sys_bsd.c | 10 +++++-----
 appl/telnet/telnet/telnet.c  |  8 +++++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/appl/telnet/telnet/externs.h b/appl/telnet/telnet/externs.h
index 7d926a40b..3511b92c2 100644
--- a/appl/telnet/telnet/externs.h
+++ b/appl/telnet/telnet/externs.h
@@ -250,7 +250,7 @@ void TerminalSaveState(void);
 void TerminalDefaultChars(void);
 void TerminalNewMode(int f);
 cc_t *tcval(int func);
-void TerminalSpeeds(long *ispeed, long *ospeed);
+void TerminalSpeeds(long *input_speed, long *output_speed);
 int TerminalWindowSize(long *rows, long *cols);
 int NetClose(int fd);
 void NetNonblockingIO(int fd, int onoff);
diff --git a/appl/telnet/telnet/sys_bsd.c b/appl/telnet/telnet/sys_bsd.c
index 477722408..178a424a4 100644
--- a/appl/telnet/telnet/sys_bsd.c
+++ b/appl/telnet/telnet/sys_bsd.c
@@ -578,7 +578,7 @@ struct termspeeds {
 #endif	/* DECODE_BAUD */
 
 void
-TerminalSpeeds(long *ispeed, long *ospeed)
+TerminalSpeeds(long *input_speed, long *output_speed)
 {
 #ifdef	DECODE_BAUD
     struct termspeeds *tp;
@@ -594,15 +594,15 @@ TerminalSpeeds(long *ispeed, long *ospeed)
     tp = termspeeds;
     while ((tp->speed != -1) && (tp->value < in))
 	tp++;
-    *ispeed = tp->speed;
+    *input_speed = tp->speed;
 
     tp = termspeeds;
     while ((tp->speed != -1) && (tp->value < out))
 	tp++;
-    *ospeed = tp->speed;
+    *output_speed = tp->speed;
 #else	/* DECODE_BAUD */
-	*ispeed = in;
-	*ospeed = out;
+	*input_speed = in;
+	*output_speed = out;
 #endif	/* DECODE_BAUD */
 }
 
diff --git a/appl/telnet/telnet/telnet.c b/appl/telnet/telnet/telnet.c
index ab9b68e24..47ed3ba38 100644
--- a/appl/telnet/telnet/telnet.c
+++ b/appl/telnet/telnet/telnet.c
@@ -731,15 +731,17 @@ suboption()
 	if (SB_EOF())
 	    return;
 	if (SB_GET() == TELQUAL_SEND) {
-	    long ospeed, ispeed;
+	    long output_speed, input_speed;
 	    unsigned char temp[50];
 	    int len;
 
-	    TerminalSpeeds(&ispeed, &ospeed);
+	    TerminalSpeeds(&input_speed, &output_speed);
 
 	    snprintf((char *)temp, sizeof(temp),
 		     "%c%c%c%c%u,%u%c%c", IAC, SB, TELOPT_TSPEED,
-		     TELQUAL_IS, (unsigned)ospeed, (unsigned)ispeed, IAC, SE);
+		     TELQUAL_IS,
+		     (unsigned)output_speed,
+		     (unsigned)input_speed, IAC, SE);
 	    len = strlen((char *)temp+4) + 4;	/* temp[3] is 0 ... */
 
 	    if (len < NETROOM()) {