From owner-svn-src-head@FreeBSD.ORG  Tue Nov 30 16:46:15 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CA8FD1065675;
	Tue, 30 Nov 2010 16:46:15 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9F5418FC0C;
	Tue, 30 Nov 2010 16:46:15 +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 oAUGkFIL014105;
	Tue, 30 Nov 2010 16:46:15 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAUGkFLk014103;
	Tue, 30 Nov 2010 16:46:15 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201011301646.oAUGkFLk014103@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 30 Nov 2010 16:46:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216079 - head/sys/dev/syscons
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Nov 2010 16:46:15 -0000

Author: jkim
Date: Tue Nov 30 16:46:15 2010
New Revision: 216079
URL: http://svn.freebsd.org/changeset/base/216079

Log:
  Clean up code a bit to make it more readable.

Modified:
  head/sys/dev/syscons/scvidctl.c

Modified: head/sys/dev/syscons/scvidctl.c
==============================================================================
--- head/sys/dev/syscons/scvidctl.c	Tue Nov 30 16:14:19 2010	(r216078)
+++ head/sys/dev/syscons/scvidctl.c	Tue Nov 30 16:46:15 2010	(r216079)
@@ -150,34 +150,33 @@ sc_set_text_mode(scr_stat *scp, struct t
 	fontwidth = info.vi_cwidth;
     if (fontsize <= 0)
 	fontsize = info.vi_cheight;
-    if (fontsize < 14) {
+    if (fontsize < 14)
 	fontsize = 8;
-#ifndef SC_NO_FONT_LOADING
-	if (!(scp->sc->fonts_loaded & FONT_8))
-	    return EINVAL;
-	font = scp->sc->font_8;
-#else
-	font = NULL;
-#endif
-    } else if (fontsize >= 16) {
+    else if (fontsize >= 16)
 	fontsize = 16;
-#ifndef SC_NO_FONT_LOADING
-	if (!(scp->sc->fonts_loaded & FONT_16))
-	    return EINVAL;
-	font = scp->sc->font_16;
-#else
-	font = NULL;
-#endif
-    } else {
+    else
 	fontsize = 14;
 #ifndef SC_NO_FONT_LOADING
-	if (!(scp->sc->fonts_loaded & FONT_14))
-	    return EINVAL;
+    switch (fontsize) {
+    case 8:
+	if ((scp->sc->fonts_loaded & FONT_8) == 0)
+	    return (EINVAL);
+	font = scp->sc->font_8;
+	break;
+    case 14:
+	if ((scp->sc->fonts_loaded & FONT_14) == 0)
+	    return (EINVAL);
 	font = scp->sc->font_14;
+	break;
+    case 16:
+	if ((scp->sc->fonts_loaded & FONT_16) == 0)
+	    return (EINVAL);
+	font = scp->sc->font_16;
+	break;
+    }
 #else
-	font = NULL;
+    font = NULL;
 #endif
-    }
     if ((xsize <= 0) || (xsize > info.vi_width))
 	xsize = info.vi_width;
     if ((ysize <= 0) || (ysize > info.vi_height))
@@ -333,34 +332,33 @@ sc_set_pixel_mode(scr_stat *scp, struct 
     /* adjust argument values */
     if (fontsize <= 0)
 	fontsize = info.vi_cheight;
-    if (fontsize < 14) {
+    if (fontsize < 14)
 	fontsize = 8;
-#ifndef SC_NO_FONT_LOADING
-	if (!(scp->sc->fonts_loaded & FONT_8))
-	    return EINVAL;
-	font = scp->sc->font_8;
-#else
-	font = NULL;
-#endif
-    } else if (fontsize >= 16) {
+    else if (fontsize >= 16)
 	fontsize = 16;
-#ifndef SC_NO_FONT_LOADING
-	if (!(scp->sc->fonts_loaded & FONT_16))
-	    return EINVAL;
-	font = scp->sc->font_16;
-#else
-	font = NULL;
-#endif
-    } else {
+    else
 	fontsize = 14;
 #ifndef SC_NO_FONT_LOADING
-	if (!(scp->sc->fonts_loaded & FONT_14))
-	    return EINVAL;
+    switch (fontsize) {
+    case 8:
+	if ((scp->sc->fonts_loaded & FONT_8) == 0)
+	    return (EINVAL);
+	font = scp->sc->font_8;
+	break;
+    case 14:
+	if ((scp->sc->fonts_loaded & FONT_14) == 0)
+	    return (EINVAL);
 	font = scp->sc->font_14;
+	break;
+    case 16:
+	if ((scp->sc->fonts_loaded & FONT_16) == 0)
+	    return (EINVAL);
+	font = scp->sc->font_16;
+	break;
+    }
 #else
-	font = NULL;
+    font = NULL;
 #endif
-    }
     if (xsize <= 0)
 	xsize = info.vi_width/8;
     if (ysize <= 0)