Vendor import of OpenSSH 3.3.

1 files changed, 9 insertions, 11 deletions

diff --git a/crypto/openssh/ttymodes.c b/crypto/openssh/ttymodes.c
index ccc001f..5cc13dc 100644
--- a/crypto/openssh/ttymodes.c
+++ b/crypto/openssh/ttymodes.c
@@ -43,7 +43,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ttymodes.c,v 1.16 2001/12/27 20:39:58 markus Exp $");
+RCSID("$OpenBSD: ttymodes.c,v 1.18 2002/06/19 00:27:55 deraadt Exp $");
 
 #include "packet.h"
 #include "log.h"
@@ -307,7 +307,6 @@ end:
 	else
 		packet_put_raw(buffer_ptr(&buf), buffer_len(&buf));
 	buffer_free(&buf);
-	return;
 }
 
 /*
@@ -402,17 +401,17 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
 				 * SSH1:
 				 * Opcodes 1 to 127 are defined to have
 				 * a one-byte argument.
-  				 * Opcodes 128 to 159 are defined to have
-  				 * an integer argument.
-  				 */
+				 * Opcodes 128 to 159 are defined to have
+				 * an integer argument.
+				 */
 				if (opcode > 0 && opcode < 128) {
 					n_bytes += 1;
 					(void) packet_get_char();
 					break;
 				} else if (opcode >= 128 && opcode < 160) {
-  					n_bytes += 4;
-  					(void) packet_get_int();
-  					break;
+					n_bytes += 4;
+					(void) packet_get_int();
+					break;
 				} else {
 					/*
 					 * It is a truly undefined opcode (160 to 255).
@@ -423,7 +422,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
 					 */
 					log("parse_tty_modes: unknown opcode %d", opcode);
 					goto set;
-  				}
+				}
 			} else {
 				/*
 				 * SSH2:
@@ -440,7 +439,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
 					log("parse_tty_modes: unknown opcode %d", opcode);
 					goto set;
 				}
-  			}
+			}
 		}
 	}
 
@@ -457,5 +456,4 @@ set:
 	/* Set the new modes for the terminal. */
 	if (tcsetattr(fd, TCSANOW, &tio) == -1)
 		log("Setting tty modes failed: %.100s", strerror(errno));
-	return;
 }