summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2000-04-20 06:19:33 +0000
committerderaadt <deraadt@openbsd.org>2000-04-20 06:19:33 +0000
commitceb11ada5171feeae3dc9ac85c580ac5ba12d1e2 (patch)
treefd8a07149d2a3cd3c9d1cb67693a257f83f64d01
parent- Formatting repairs and standardizations. (diff)
downloadwireguard-openbsd-ceb11ada5171feeae3dc9ac85c580ac5ba12d1e2.tar.xz
wireguard-openbsd-ceb11ada5171feeae3dc9ac85c580ac5ba12d1e2.zip
avoid naming something pwrite()
-rw-r--r--usr.bin/tip/acu.c10
-rw-r--r--usr.bin/tip/cmds.c12
-rw-r--r--usr.bin/tip/tip.c12
-rw-r--r--usr.bin/tip/tip.h4
4 files changed, 19 insertions, 19 deletions
diff --git a/usr.bin/tip/acu.c b/usr.bin/tip/acu.c
index 5f71f63212b..a6acf8dfc79 100644
--- a/usr.bin/tip/acu.c
+++ b/usr.bin/tip/acu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acu.c,v 1.4 1997/09/01 23:24:23 deraadt Exp $ */
+/* $OpenBSD: acu.c,v 1.5 2000/04/20 06:19:33 deraadt Exp $ */
/* $NetBSD: acu.c,v 1.4 1996/12/29 10:34:03 cgd Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)acu.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: acu.c,v 1.4 1997/09/01 23:24:23 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: acu.c,v 1.5 2000/04/20 06:19:33 deraadt Exp $";
#endif /* not lint */
#include "tip.h"
@@ -74,7 +74,7 @@ connect()
if (!DU) { /* regular connect message */
if (CM != NOSTR)
- pwrite(FD, CM, size(CM));
+ parwrite(FD, CM, size(CM));
logent(value(HOST), "", DV, "call completed");
return (NOSTR);
}
@@ -109,7 +109,7 @@ connect()
if ((conflag = (*acu->acu_dialer)(phnum, CU))) {
if (CM != NOSTR)
- pwrite(FD, CM, size(CM));
+ parwrite(FD, CM, size(CM));
logent(value(HOST), phnum, acu->acu_name,
"call completed");
return (NOSTR);
@@ -147,7 +147,7 @@ connect()
if ((conflag = (*acu->acu_dialer)(phnum, CU))) {
fclose(fd);
if (CM != NOSTR)
- pwrite(FD, CM, size(CM));
+ parwrite(FD, CM, size(CM));
logent(value(HOST), phnum, acu->acu_name,
"call completed");
return (NOSTR);
diff --git a/usr.bin/tip/cmds.c b/usr.bin/tip/cmds.c
index 0530eca9e93..4aa91ccfbde 100644
--- a/usr.bin/tip/cmds.c
+++ b/usr.bin/tip/cmds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmds.c,v 1.7 1997/09/01 23:24:23 deraadt Exp $ */
+/* $OpenBSD: cmds.c,v 1.8 2000/04/20 06:19:33 deraadt Exp $ */
/* $NetBSD: cmds.c,v 1.7 1997/02/11 09:24:03 mrg Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)cmds.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: cmds.c,v 1.7 1997/09/01 23:24:23 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: cmds.c,v 1.8 2000/04/20 06:19:33 deraadt Exp $";
#endif /* not lint */
#include "tip.h"
@@ -139,7 +139,7 @@ transfer(buf, fd, eofchars)
sig_t f;
char r;
- pwrite(FD, buf, size(buf));
+ parwrite(FD, buf, size(buf));
quit = 0;
kill(pid, SIGIOT);
read(repdes[0], (char *)&ccc, 1); /* Wait until read process stops */
@@ -148,7 +148,7 @@ transfer(buf, fd, eofchars)
* finish command
*/
r = '\r';
- pwrite(FD, &r, 1);
+ parwrite(FD, &r, 1);
do
read(FD, &c, 1);
while ((c&STRIP_PAR) != '\n');
@@ -430,7 +430,7 @@ send(c)
int retry = 0;
cc = c;
- pwrite(FD, &cc, 1);
+ parwrite(FD, &cc, 1);
#ifdef notdef
if (number(value(CDELAY)) > 0 && c != '\r')
nap(number(value(CDELAY)));
@@ -451,7 +451,7 @@ tryagain:
printf("\r\ntimeout error (%s)\r\n", ctrl(c));
if (retry++ > 3)
return;
- pwrite(FD, &null, 1); /* poke it */
+ parwrite(FD, &null, 1); /* poke it */
goto tryagain;
}
}
diff --git a/usr.bin/tip/tip.c b/usr.bin/tip/tip.c
index 0944a58b6f1..53afe0d08a8 100644
--- a/usr.bin/tip/tip.c
+++ b/usr.bin/tip/tip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tip.c,v 1.10 2000/01/09 05:38:47 jason Exp $ */
+/* $OpenBSD: tip.c,v 1.11 2000/04/20 06:19:33 deraadt Exp $ */
/* $NetBSD: tip.c,v 1.13 1997/04/20 00:03:05 mellon Exp $ */
/*
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)tip.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: tip.c,v 1.10 2000/01/09 05:38:47 jason Exp $";
+static char rcsid[] = "$OpenBSD: tip.c,v 1.11 2000/04/20 06:19:33 deraadt Exp $";
#endif /* not lint */
/*
@@ -395,7 +395,7 @@ tipin()
continue;
} else if (gch == '\r') {
bol = 1;
- pwrite(FD, &gch, 1);
+ parwrite(FD, &gch, 1);
if (boolean(value(HALFDUPLEX)))
printf("\r\n");
continue;
@@ -404,7 +404,7 @@ tipin()
bol = any(gch, value(EOL));
if (boolean(value(RAISE)) && islower(gch))
gch = toupper(gch);
- pwrite(FD, &gch, 1);
+ parwrite(FD, &gch, 1);
if (boolean(value(HALFDUPLEX)))
printf("%c", gch);
}
@@ -434,7 +434,7 @@ escape()
}
/* ESCAPE ESCAPE forces ESCAPE */
if (c != gch)
- pwrite(FD, &c, 1);
+ parwrite(FD, &c, 1);
return (gch);
}
@@ -585,7 +585,7 @@ static char partab[0200];
* with the right parity and output it.
*/
void
-pwrite(fd, buf, n)
+parwrite(fd, buf, n)
int fd;
char *buf;
register int n;
diff --git a/usr.bin/tip/tip.h b/usr.bin/tip/tip.h
index 17d3aa0a576..12dabf80d68 100644
--- a/usr.bin/tip/tip.h
+++ b/usr.bin/tip/tip.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tip.h,v 1.9 1998/07/12 05:27:03 todd Exp $ */
+/* $OpenBSD: tip.h,v 1.10 2000/04/20 06:19:33 deraadt Exp $ */
/* $NetBSD: tip.h,v 1.7 1997/04/20 00:02:46 mellon Exp $ */
/*
@@ -291,7 +291,7 @@ void execute __P((char *s));
void logent __P((char *group, char *num, char *acu, char *message));
void loginit __P((void));
void prtime __P((char *s, time_t a));
-void pwrite __P((int fd, char *buf, int n));
+void parwrite __P((int fd, char *buf, int n));
void raw __P((void));
void send __P((int c));
void setparity __P((char *defparity));