From owner-svn-src-user@FreeBSD.ORG  Wed Nov 25 10:56:51 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4A0D9106568D;
	Wed, 25 Nov 2009 10:56:51 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1FC998FC19;
	Wed, 25 Nov 2009 10:56:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAPAuovV046884;
	Wed, 25 Nov 2009 10:56:50 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAPAuoLN046882;
	Wed, 25 Nov 2009 10:56:50 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200911251056.nAPAuoLN046882@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Wed, 25 Nov 2009 10:56:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199793 - user/ed/newcons/sys/kern
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Nov 2009 10:56:51 -0000

Author: ed
Date: Wed Nov 25 10:56:50 2009
New Revision: 199793
URL: http://svn.freebsd.org/changeset/base/199793

Log:
  Tidy up this code by moving the TTY == NULL checks to the top.

Modified:
  user/ed/newcons/sys/kern/subr_terminal.c

Modified: user/ed/newcons/sys/kern/subr_terminal.c
==============================================================================
--- user/ed/newcons/sys/kern/subr_terminal.c	Wed Nov 25 10:52:41 2009	(r199792)
+++ user/ed/newcons/sys/kern/subr_terminal.c	Wed Nov 25 10:56:50 2009	(r199793)
@@ -233,45 +233,46 @@ terminal_input_char(struct terminal *tm,
 {
 	struct tty *tp;
 
+	tp = tm->tm_tty;
+	if (tp == NULL)
+		return;
+
 	/* Strip off any attributes. */
 	c = TCHAR_CHARACTER(c);
 
-	tp = tm->tm_tty;
-	if (tp != NULL) {
-		tty_lock(tp);
-		/*
-		 * Conversion to UTF-8.
-		 */
-		if (c < 0x80) {
-			ttydisc_rint(tp, c, 0);
-		} else if (c < 0x800) {
-			char str[2] = {
-				0xc0 | (c >> 6),
-				0x80 | (c & 0x3f)
-			};
-
-			ttydisc_rint_simple(tp, str, sizeof str);
-		} else if (c < 0x10000) {
-			char str[3] = {
-				0xe0 | (c >> 12),
-				0x80 | ((c >> 6) & 0x3f),
-				0x80 | (c & 0x3f)
-			};
-
-			ttydisc_rint_simple(tp, str, sizeof str);
-		} else {
-			char str[4] = {
-				0xf0 | (c >> 18),
-				0x80 | ((c >> 12) & 0x3f),
-				0x80 | ((c >> 6) & 0x3f),
-				0x80 | (c & 0x3f)
-			};
+	tty_lock(tp);
+	/*
+	 * Conversion to UTF-8.
+	 */
+	if (c < 0x80) {
+		ttydisc_rint(tp, c, 0);
+	} else if (c < 0x800) {
+		char str[2] = {
+			0xc0 | (c >> 6),
+			0x80 | (c & 0x3f)
+		};
+
+		ttydisc_rint_simple(tp, str, sizeof str);
+	} else if (c < 0x10000) {
+		char str[3] = {
+			0xe0 | (c >> 12),
+			0x80 | ((c >> 6) & 0x3f),
+			0x80 | (c & 0x3f)
+		};
+
+		ttydisc_rint_simple(tp, str, sizeof str);
+	} else {
+		char str[4] = {
+			0xf0 | (c >> 18),
+			0x80 | ((c >> 12) & 0x3f),
+			0x80 | ((c >> 6) & 0x3f),
+			0x80 | (c & 0x3f)
+		};
 
-			ttydisc_rint_simple(tp, str, sizeof str);
-		}
-		ttydisc_rint_done(tp);
-		tty_unlock(tp);
+		ttydisc_rint_simple(tp, str, sizeof str);
 	}
+	ttydisc_rint_done(tp);
+	tty_unlock(tp);
 }
 
 void
@@ -280,12 +281,13 @@ terminal_input_raw(struct terminal *tm, 
 	struct tty *tp;
 
 	tp = tm->tm_tty;
-	if (tp != NULL) {
-		tty_lock(tp);
-		ttydisc_rint(tp, c, 0);
-		ttydisc_rint_done(tp);
-		tty_unlock(tp);
-	}
+	if (tp == NULL)
+		return;
+
+	tty_lock(tp);
+	ttydisc_rint(tp, c, 0);
+	ttydisc_rint_done(tp);
+	tty_unlock(tp);
 }
 
 void
@@ -533,9 +535,10 @@ termteken_respond(void *softc, const voi
 	 * input.
 	 */
 	tp = tm->tm_tty;
-	if (tp != NULL) {
-		ttydisc_rint_simple(tp, buf, len);
-		ttydisc_rint_done(tp);
-	}
+	if (tp == NULL)
+		return;
+
+	ttydisc_rint_simple(tp, buf, len);
+	ttydisc_rint_done(tp);
 #endif
 }