===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ttymodes.c,v
retrieving revision 1.19.10.1
retrieving revision 1.20
diff -u -r1.19.10.1 -r1.20
--- src/usr.bin/ssh/ttymodes.c	2006/10/06 03:19:33	1.19.10.1
+++ src/usr.bin/ssh/ttymodes.c	2006/02/07 01:42:00	1.20
@@ -1,4 +1,3 @@
-/* $OpenBSD: ttymodes.c,v 1.19.10.1 2006/10/06 03:19:33 brad Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -43,18 +42,17 @@
  * suitable code.
  */
 
-#include <sys/types.h>
+#include "includes.h"
+RCSID("$OpenBSD: ttymodes.c,v 1.20 2006/02/07 01:42:00 stevesk Exp $");
 
-#include <errno.h>
-#include <string.h>
 #include <termios.h>
-#include <stdarg.h>
 
 #include "packet.h"
 #include "log.h"
 #include "ssh1.h"
 #include "compat.h"
 #include "buffer.h"
+#include "bufaux.h"
 
 #define TTY_OP_END		0
 /*
@@ -362,8 +360,7 @@
 			n_bytes += 4;
 			baud = packet_get_int();
 			debug3("tty_parse_modes: ispeed %d", baud);
-			if (failure != -1 &&
-			    cfsetispeed(&tio, baud_to_speed(baud)) == -1)
+			if (failure != -1 && cfsetispeed(&tio, baud_to_speed(baud)) == -1)
 				error("cfsetispeed failed for %d", baud);
 			break;
 
@@ -373,8 +370,7 @@
 			n_bytes += 4;
 			baud = packet_get_int();
 			debug3("tty_parse_modes: ospeed %d", baud);
-			if (failure != -1 &&
-			    cfsetospeed(&tio, baud_to_speed(baud)) == -1)
+			if (failure != -1 && cfsetospeed(&tio, baud_to_speed(baud)) == -1)
 				error("cfsetospeed failed for %d", baud);
 			break;
 
@@ -422,12 +418,11 @@
 					/*
 					 * It is a truly undefined opcode (160 to 255).
 					 * We have no idea about its arguments.  So we
-					 * must stop parsing.  Note that some data
-					 * may be left in the packet; hopefully there
-					 * is nothing more coming after the mode data.
+					 * must stop parsing.  Note that some data may be
+					 * left in the packet; hopefully there is nothing
+					 * more coming after the mode data.
 					 */
-					logit("parse_tty_modes: unknown opcode %d",
-					    opcode);
+					logit("parse_tty_modes: unknown opcode %d", opcode);
 					goto set;
 				}
 			} else {
@@ -443,8 +438,7 @@
 					(void) packet_get_int();
 					break;
 				} else {
-					logit("parse_tty_modes: unknown opcode %d",
-					    opcode);
+					logit("parse_tty_modes: unknown opcode %d", opcode);
 					goto set;
 				}
 			}