summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <tb@cvs.openbsd.org>2016-01-29 21:23:12 +0000
committertb <tb@cvs.openbsd.org>2016-01-29 21:23:12 +0000
commitb25e42660220501f6246fd5786bdd1508c5b0aa0 (patch)
tree8a137248b4a30158964310c4ce598890c2cb64bb
parentf180b94c3fc2b56f541a0cb7f748e1bb89b096ae (diff)
Remove code that has been disabled for almost 20 years:
No need for bauds structure, since handled by cfsetspeed. From Chris Bennett, thanks! ok millert@
-rw-r--r--usr.sbin/lpr/lpd/printjob.c40
1 files changed, 1 insertions, 39 deletions
diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c
index febf582d7d6..d302bee2283 100644
--- a/usr.sbin/lpr/lpd/printjob.c
+++ b/usr.sbin/lpr/lpd/printjob.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: printjob.c,v 1.56 2016/01/12 23:35:13 tb Exp $ */
+/* $OpenBSD: printjob.c,v 1.57 2016/01/29 21:23:11 tb Exp $ */
/* $NetBSD: printjob.c,v 1.31 2002/01/21 14:42:30 wiz Exp $ */
/*
@@ -1516,32 +1516,6 @@ alarmer(int s)
/* nothing */
}
-#if !defined(__NetBSD__) && !defined(__OpenBSD__)
-struct bauds {
- int baud;
- int speed;
-} bauds[] = {
- 50, B50,
- 75, B75,
- 110, B110,
- 134, B134,
- 150, B150,
- 200, B200,
- 300, B300,
- 600, B600,
- 1200, B1200,
- 1800, B1800,
- 2400, B2400,
- 4800, B4800,
- 9600, B9600,
- 19200, B19200,
- 38400, B38400,
- 57600, B57600,
- 115200, B115200,
- 0, 0
-};
-#endif
-
/*
* setup tty lines.
*/
@@ -1562,19 +1536,7 @@ setty(void)
exit(1);
}
if (BR > 0) {
-#if defined(__NetBSD__) || defined(__OpenBSD__)
cfsetspeed(&i.t, BR);
-#else
- struct bauds *bp;
- for (bp = bauds; bp->baud; bp++)
- if (BR == bp->baud)
- break;
- if (!bp->baud) {
- syslog(LOG_ERR, "%s: illegal baud rate %d", printer, BR);
- exit(1);
- }
- cfsetspeed(&i.t, bp->speed);
-#endif
i.set = 1;
}
if (MS) {