Author: marius
Date: Tue Jul 26 13:29:11 2011
New Revision: 224441
URL: http://svn.freebsd.org/changeset/base/224441
Log:
MFC: r220389, r220392
- Mark getc() as inline, this has no effect on gcc but helps clang.
- Move getc() body before xgetc() so gcc does not emit a warning about
function
having no body.
Approved by: jhb
Modified:
stable/7/sys/boot/i386/boot2/boot2.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/boot/i386/boot2/boot2.c
==============================================================================
--- stable/7/sys/boot/i386/boot2/boot2.c Tue Jul 26 13:29:11 2011
(r224440)
+++ stable/7/sys/boot/i386/boot2/boot2.c Tue Jul 26 13:29:11 2011
(r224441)
@@ -148,7 +148,7 @@ static int drvread(void *, unsigned, uns
static int keyhit(unsigned);
static int xputc(int);
static int xgetc(int);
-static int getc(int);
+static inline int getc(int);
static void memcpy(void *, const void *, int);
static void
@@ -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);
-}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
