From owner-svn-src-all@FreeBSD.ORG  Wed Apr  6 17:54:12 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D4943106566C;
	Wed,  6 Apr 2011 17:54:12 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C443C8FC19;
	Wed,  6 Apr 2011 17:54:12 +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 p36HsCUl007718;
	Wed, 6 Apr 2011 17:54:12 GMT (envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p36HsCuj007716;
	Wed, 6 Apr 2011 17:54:12 GMT (envelope-from rdivacky@svn.freebsd.org)
Message-Id: <201104061754.p36HsCuj007716@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Wed, 6 Apr 2011 17:54:12 +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: r220392 - head/sys/boot/i386/boot2
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Apr 2011 17:54:12 -0000

Author: rdivacky
Date: Wed Apr  6 17:54:12 2011
New Revision: 220392
URL: http://svn.freebsd.org/changeset/base/220392

Log:
  Move getc() body before xgetc() so gcc does not emit a warning about function
  having no body.
  
  Approved by:    jhb

Modified:
  head/sys/boot/i386/boot2/boot2.c

Modified: head/sys/boot/i386/boot2/boot2.c
==============================================================================
--- head/sys/boot/i386/boot2/boot2.c	Wed Apr  6 17:54:10 2011	(r220391)
+++ head/sys/boot/i386/boot2/boot2.c	Wed Apr  6 17:54:12 2011	(r220392)
@@ -627,6 +627,15 @@ xputc(int c)
 }
 
 static int
+getc(int fn)
+{
+    v86.addr = 0x16;
+    v86.eax = fn << 8;
+    v86int();
+    return fn == 0 ? v86.eax & 0xff : !V86_ZR(v86.efl);
+}
+
+static int
 xgetc(int fn)
 {
     if (OPT_CHECK(RBX_NOINTR))
@@ -640,12 +649,3 @@ xgetc(int fn)
 	    return 0;
     }
 }
-
-static int
-getc(int fn)
-{
-    v86.addr = 0x16;
-    v86.eax = fn << 8;
-    v86int();
-    return fn == 0 ? v86.eax & 0xff : !V86_ZR(v86.efl);
-}