From 5c4a9b57f0dd948e8edfb0cff21b1aaa0c8738fc Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Thu, 9 Jul 1998 23:16:40 +0000
Subject: [PATCH] s/net_write/telnet_net_write/

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5072 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/telnet/libtelnet/auth.c       |  6 +++---
 appl/telnet/libtelnet/enc-proto.h  |  1 -
 appl/telnet/libtelnet/enc_des.c    |  6 +++---
 appl/telnet/libtelnet/encrypt.c    | 12 ++++++------
 appl/telnet/libtelnet/kerberos.c   |  2 +-
 appl/telnet/libtelnet/kerberos5.c  |  2 +-
 appl/telnet/libtelnet/krb4encpwd.c |  2 +-
 appl/telnet/libtelnet/misc-proto.h |  2 +-
 appl/telnet/libtelnet/rsaencpwd.c  |  2 +-
 appl/telnet/libtelnet/spx.c        |  2 +-
 appl/telnet/telnet/authenc.c       |  2 +-
 appl/telnet/telnet/externs.h       |  2 +-
 appl/telnet/telnetd/authenc.c      |  2 +-
 appl/telnet/telnetd/ext.h          |  2 +-
 appl/telnet/telnetd/telnetd.c      | 12 ++++++------
 15 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/appl/telnet/libtelnet/auth.c b/appl/telnet/libtelnet/auth.c
index 32fd88ca2..8bcba16c1 100644
--- a/appl/telnet/libtelnet/auth.c
+++ b/appl/telnet/libtelnet/auth.c
@@ -378,7 +378,7 @@ auth_request(void)
 	}
 	*e++ = IAC;
 	*e++ = SE;
-	net_write(str_request, e - str_request);
+	telnet_net_write(str_request, e - str_request);
 	printsub('>', &str_request[2], e - str_request - 2);
     }
 }
@@ -463,7 +463,7 @@ auth_send(unsigned char *data, int cnt)
 	}
 	auth_send_data += 2;
     }
-    net_write(str_none, sizeof(str_none));
+    telnet_net_write(str_none, sizeof(str_none));
     printsub('>', &str_none[2], sizeof(str_none) - 2);
     if (auth_debug_mode)
 	printf(">>>%s: Sent failure message\r\n", Name);
@@ -564,7 +564,7 @@ auth_sendname(unsigned char *cp, int len)
     }
     *e++ = IAC;
     *e++ = SE;
-    net_write(str_request, e - str_request);
+    telnet_net_write(str_request, e - str_request);
     printsub('>', &str_request[2], e - &str_request[2]);
     return(1);
 }
diff --git a/appl/telnet/libtelnet/enc-proto.h b/appl/telnet/libtelnet/enc-proto.h
index 8535537b9..6a0e22e5e 100644
--- a/appl/telnet/libtelnet/enc-proto.h
+++ b/appl/telnet/libtelnet/enc-proto.h
@@ -74,7 +74,6 @@ int EncryptStopInput(void);
 int EncryptStopOutput(void);
 int EncryptType(char*, char*);
 int EncryptVerbose(int);
-int net_write (unsigned char *, int);
 void decrypt_auto(int);
 void encrypt_auto(int);
 void encrypt_debug(int);
diff --git a/appl/telnet/libtelnet/enc_des.c b/appl/telnet/libtelnet/enc_des.c
index 984bd3a5a..a5c32465d 100644
--- a/appl/telnet/libtelnet/enc_des.c
+++ b/appl/telnet/libtelnet/enc_des.c
@@ -235,7 +235,7 @@ static int fb64_start(struct fb *fbp, int dir, int server)
 		*p++ = IAC;
 		*p++ = SE;
 		printsub('>', &fbp->fb_feed[2], p - &fbp->fb_feed[2]);
-		net_write(fbp->fb_feed, p - fbp->fb_feed);
+		telnet_net_write(fbp->fb_feed, p - fbp->fb_feed);
 		break;
 	default:
 		return(FAILED);
@@ -293,7 +293,7 @@ int fb64_is(unsigned char *data, int cnt, struct fb *fbp)
 		*p++ = IAC;
 		*p++ = SE;
 		printsub('>', &fbp->fb_feed[2], p - &fbp->fb_feed[2]);
-		net_write(fbp->fb_feed, p - fbp->fb_feed);
+		telnet_net_write(fbp->fb_feed, p - fbp->fb_feed);
 
 		state = fbp->state[DIR_DECRYPT-1] = IN_PROGRESS;
 		break;
@@ -318,7 +318,7 @@ int fb64_is(unsigned char *data, int cnt, struct fb *fbp)
 		*p++ = IAC;
 		*p++ = SE;
 		printsub('>', &fbp->fb_feed[2], p - &fbp->fb_feed[2]);
-		net_write(fbp->fb_feed, p - fbp->fb_feed);
+		telnet_net_write(fbp->fb_feed, p - fbp->fb_feed);
 
 		break;
 	}
diff --git a/appl/telnet/libtelnet/encrypt.c b/appl/telnet/libtelnet/encrypt.c
index c512ed8a5..86d052ead 100644
--- a/appl/telnet/libtelnet/encrypt.c
+++ b/appl/telnet/libtelnet/encrypt.c
@@ -436,7 +436,7 @@ encrypt_send_support(void)
 	 */
 	if (!Server && autodecrypt)
 	    encrypt_send_request_start();
-	net_write(str_send, str_suplen);
+	telnet_net_write(str_send, str_suplen);
 	printsub('>', &str_send[2], str_suplen - 2);
 	str_suplen = 0;
     }
@@ -798,7 +798,7 @@ void encrypt_send_keyid(int dir, unsigned char *keyid, int keylen, int saveit)
     }
     *strp++ = IAC;
     *strp++ = SE;
-    net_write(str_keyid, strp - str_keyid);
+    telnet_net_write(str_keyid, strp - str_keyid);
     printsub('>', &str_keyid[2], strp - str_keyid - 2);
 }
 
@@ -857,7 +857,7 @@ encrypt_start_output(int type)
     }
     *p++ = IAC;
     *p++ = SE;
-    net_write(str_start, p - str_start);
+    telnet_net_write(str_start, p - str_start);
     net_encrypt();
     printsub('>', &str_start[2], p - &str_start[2]);
     /*
@@ -883,7 +883,7 @@ encrypt_send_end(void)
 	return;
 
     str_end[3] = ENCRYPT_END;
-    net_write(str_end, sizeof(str_end));
+    telnet_net_write(str_end, sizeof(str_end));
     net_encrypt();
     printsub('>', &str_end[2], sizeof(str_end) - 2);
     /*
@@ -911,7 +911,7 @@ encrypt_send_request_start(void)
     }
     *p++ = IAC;
     *p++ = SE;
-    net_write(str_start, p - str_start);
+    telnet_net_write(str_start, p - str_start);
     printsub('>', &str_start[2], p - &str_start[2]);
     if (encrypt_debug_mode)
 	printf(">>>%s: Request input to be encrypted\r\n", Name);
@@ -921,7 +921,7 @@ void
 encrypt_send_request_end(void)
 {
     str_end[3] = ENCRYPT_REQEND;
-    net_write(str_end, sizeof(str_end));
+    telnet_net_write(str_end, sizeof(str_end));
     printsub('>', &str_end[2], sizeof(str_end) - 2);
 
     if (encrypt_debug_mode)
diff --git a/appl/telnet/libtelnet/kerberos.c b/appl/telnet/libtelnet/kerberos.c
index d74cbbc00..abcbc4545 100644
--- a/appl/telnet/libtelnet/kerberos.c
+++ b/appl/telnet/libtelnet/kerberos.c
@@ -139,7 +139,7 @@ Data(Authenticator *ap, int type, const void *d, int c)
     *p++ = SE;
     if (str_data[3] == TELQUAL_IS)
 	printsub('>', &str_data[2], p - (&str_data[2]));
-    return(net_write(str_data, p - str_data));
+    return(telnet_net_write(str_data, p - str_data));
 }
 
 int
diff --git a/appl/telnet/libtelnet/kerberos5.c b/appl/telnet/libtelnet/kerberos5.c
index 89850e1e5..69181b550 100644
--- a/appl/telnet/libtelnet/kerberos5.c
+++ b/appl/telnet/libtelnet/kerberos5.c
@@ -146,7 +146,7 @@ Data(Authenticator *ap, int type, void *d, int c)
     *p++ = SE;
     if (str_data[3] == TELQUAL_IS)
 	printsub('>', &str_data[2], p - &str_data[2]);
-    return(net_write(str_data, p - str_data));
+    return(telnet_net_write(str_data, p - str_data));
 }
 
 int
diff --git a/appl/telnet/libtelnet/krb4encpwd.c b/appl/telnet/libtelnet/krb4encpwd.c
index d7e5d05cb..32c1ecac5 100644
--- a/appl/telnet/libtelnet/krb4encpwd.c
+++ b/appl/telnet/libtelnet/krb4encpwd.c
@@ -143,7 +143,7 @@ Data(ap, type, d, c)
 	*p++ = SE;
 	if (str_data[3] == TELQUAL_IS)
 		printsub('>', &str_data[2], p - (&str_data[2]));
-	return(net_write(str_data, p - str_data));
+	return(telnet_net_write(str_data, p - str_data));
 }
 
 	int
diff --git a/appl/telnet/libtelnet/misc-proto.h b/appl/telnet/libtelnet/misc-proto.h
index a42139090..218a38b19 100644
--- a/appl/telnet/libtelnet/misc-proto.h
+++ b/appl/telnet/libtelnet/misc-proto.h
@@ -70,7 +70,7 @@ int Ambiguous(void *s);
 /*
  * These functions are imported from the application
  */
-int net_write (unsigned char *, int);
+int telnet_net_write (unsigned char *, int);
 void net_encrypt (void);
 int telnet_spin (void);
 char *telnet_getenv (char *);
diff --git a/appl/telnet/libtelnet/rsaencpwd.c b/appl/telnet/libtelnet/rsaencpwd.c
index 60b9abad4..c53b9bfff 100644
--- a/appl/telnet/libtelnet/rsaencpwd.c
+++ b/appl/telnet/libtelnet/rsaencpwd.c
@@ -143,7 +143,7 @@ Data(ap, type, d, c)
 	*p++ = SE;
 	if (str_data[3] == TELQUAL_IS)
 		printsub('>', &str_data[2], p - (&str_data[2]));
-	return(net_write(str_data, p - str_data));
+	return(telnet_net_write(str_data, p - str_data));
 }
 
 	int
diff --git a/appl/telnet/libtelnet/spx.c b/appl/telnet/libtelnet/spx.c
index 73eaddf7a..0e0dd08c4 100644
--- a/appl/telnet/libtelnet/spx.c
+++ b/appl/telnet/libtelnet/spx.c
@@ -160,7 +160,7 @@ Data(ap, type, d, c)
 	*p++ = SE;
 	if (str_data[3] == TELQUAL_IS)
 		printsub('>', &str_data[2], p - (&str_data[2]));
-	return(net_write(str_data, p - str_data));
+	return(telnet_net_write(str_data, p - str_data));
 }
 
 	int
diff --git a/appl/telnet/telnet/authenc.c b/appl/telnet/telnet/authenc.c
index a7c4d9792..2add1c85f 100644
--- a/appl/telnet/telnet/authenc.c
+++ b/appl/telnet/telnet/authenc.c
@@ -37,7 +37,7 @@ RCSID("$Id$");
 
 #if	defined(AUTHENTICATION) || defined(ENCRYPTION)
 int
-net_write(unsigned char *str, int len)
+telnet_net_write(unsigned char *str, int len)
 {
 	if (NETROOM() > len) {
 		ring_supply_data(&netoring, str, len);
diff --git a/appl/telnet/telnet/externs.h b/appl/telnet/telnet/externs.h
index fd834a302..14289285e 100644
--- a/appl/telnet/telnet/externs.h
+++ b/appl/telnet/telnet/externs.h
@@ -179,7 +179,7 @@ extern jmp_buf
 /* authenc.c */
 
 #if	defined(AUTHENTICATION) || defined(ENCRYPTION)
-int net_write(unsigned char *str, int len);
+int telnet_net_write(unsigned char *str, int len);
 void net_encrypt(void);
 int telnet_spin(void);
 char *telnet_getenv(char *val);
diff --git a/appl/telnet/telnetd/authenc.c b/appl/telnet/telnetd/authenc.c
index 46ee0076c..e27fad556 100644
--- a/appl/telnet/telnetd/authenc.c
+++ b/appl/telnet/telnetd/authenc.c
@@ -38,7 +38,7 @@ RCSID("$Id$");
 #ifdef AUTHENTICATION
 
 int
-net_write(unsigned char *str, int len)
+telnet_net_write(unsigned char *str, int len)
 {
     if (nfrontp + len < netobuf + BUFSIZ) {
 	memmove(nfrontp, str, len);
diff --git a/appl/telnet/telnetd/ext.h b/appl/telnet/telnetd/ext.h
index c9583394b..e13c3cc2e 100644
--- a/appl/telnet/telnetd/ext.h
+++ b/appl/telnet/telnetd/ext.h
@@ -75,7 +75,7 @@ extern int	ourpty, net;
 extern char	*line;
 extern int	SYNCHing;		/* we are in TELNET SYNCH mode */
 
-int net_write (unsigned char *str, int len);
+int telnet_net_write (unsigned char *str, int len);
 void net_encrypt (void);
 int telnet_spin (void);
 char *telnet_getenv (char *val);
diff --git a/appl/telnet/telnetd/telnetd.c b/appl/telnet/telnetd/telnetd.c
index 8abe5ec83..79c42d053 100644
--- a/appl/telnet/telnetd/telnetd.c
+++ b/appl/telnet/telnetd/telnetd.c
@@ -537,33 +537,33 @@ getterminaltype(char *name, size_t name_sz)
 	static unsigned char sb[] =
 	{ IAC, SB, TELOPT_TSPEED, TELQUAL_SEND, IAC, SE };
 
-	net_write (sb, sizeof sb);
+	telnet_net_write (sb, sizeof sb);
 	DIAG(TD_OPTIONS, printsub('>', sb + 2, sizeof sb - 2););
     }
     if (his_state_is_will(TELOPT_XDISPLOC)) {
 	static unsigned char sb[] =
 	{ IAC, SB, TELOPT_XDISPLOC, TELQUAL_SEND, IAC, SE };
 
-	net_write (sb, sizeof sb);
+	telnet_net_write (sb, sizeof sb);
 	DIAG(TD_OPTIONS, printsub('>', sb + 2, sizeof sb - 2););
     }
     if (his_state_is_will(TELOPT_NEW_ENVIRON)) {
 	static unsigned char sb[] =
 	{ IAC, SB, TELOPT_NEW_ENVIRON, TELQUAL_SEND, IAC, SE };
 
-	net_write (sb, sizeof sb);
+	telnet_net_write (sb, sizeof sb);
 	DIAG(TD_OPTIONS, printsub('>', sb + 2, sizeof sb - 2););
     }
     else if (his_state_is_will(TELOPT_OLD_ENVIRON)) {
 	static unsigned char sb[] =
 	{ IAC, SB, TELOPT_OLD_ENVIRON, TELQUAL_SEND, IAC, SE };
 
-	net_write (sb, sizeof sb);
+	telnet_net_write (sb, sizeof sb);
 	DIAG(TD_OPTIONS, printsub('>', sb + 2, sizeof sb - 2););
     }
     if (his_state_is_will(TELOPT_TTYPE)) {
 
-	net_write (ttytype_sbbuf, sizeof ttytype_sbbuf);
+	telnet_net_write (ttytype_sbbuf, sizeof ttytype_sbbuf);
 	DIAG(TD_OPTIONS, printsub('>', ttytype_sbbuf + 2,
 				  sizeof ttytype_sbbuf - 2););
     }
@@ -638,7 +638,7 @@ _gettermname()
     if (his_state_is_wont(TELOPT_TTYPE))
 	return;
     settimer(baseline);
-    net_write (ttytype_sbbuf, sizeof ttytype_sbbuf);
+    telnet_net_write (ttytype_sbbuf, sizeof ttytype_sbbuf);
     DIAG(TD_OPTIONS, printsub('>', ttytype_sbbuf + 2,
 			      sizeof ttytype_sbbuf - 2););
     while (sequenceIs(ttypesubopt, baseline))