From owner-svn-src-head@FreeBSD.ORG  Mon Jan 14 15:05:23 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id D1743AE8;
 Mon, 14 Jan 2013 15:05:23 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A6A19E38;
 Mon, 14 Jan 2013 15:05:23 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0EF5N69021258;
 Mon, 14 Jan 2013 15:05:23 GMT (envelope-from sbruno@svn.freebsd.org)
Received: (from sbruno@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0EF5N18021253;
 Mon, 14 Jan 2013 15:05:23 GMT (envelope-from sbruno@svn.freebsd.org)
Message-Id: <201301141505.r0EF5N18021253@svn.freebsd.org>
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Mon, 14 Jan 2013 15:05:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245424 - head/sys/boot/i386/libi386
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Mon, 14 Jan 2013 15:05:23 -0000

Author: sbruno
Date: Mon Jan 14 15:05:22 2013
New Revision: 245424
URL: http://svnweb.freebsd.org/changeset/base/245424

Log:
  Quiesce some clang warnings while we're here doing stuff.
  
  Submitted by:	Hiren Panchasara <hiren.panchasara@gmail.com>
  Obtained from:	Yahoo! Inc

Modified:
  head/sys/boot/i386/libi386/bootinfo64.c
  head/sys/boot/i386/libi386/devicename.c
  head/sys/boot/i386/libi386/pxe.c

Modified: head/sys/boot/i386/libi386/bootinfo64.c
==============================================================================
--- head/sys/boot/i386/libi386/bootinfo64.c	Mon Jan 14 13:06:35 2013	(r245423)
+++ head/sys/boot/i386/libi386/bootinfo64.c	Mon Jan 14 15:05:22 2013	(r245424)
@@ -134,7 +134,8 @@ bi_checkcpu(void)
 {
     char *cpu_vendor;
     int vendor[3];
-    int eflags, regs[4];
+    int eflags;
+    unsigned int regs[4];
 
     /* Check for presence of "cpuid". */
     eflags = read_eflags();

Modified: head/sys/boot/i386/libi386/devicename.c
==============================================================================
--- head/sys/boot/i386/libi386/devicename.c	Mon Jan 14 13:06:35 2013	(r245423)
+++ head/sys/boot/i386/libi386/devicename.c	Mon Jan 14 15:05:22 2013	(r245424)
@@ -128,7 +128,7 @@ i386_parsedev(struct i386_devdesc **dev,
 		goto fail;
 	    }
 	} else {
-		cp = np;
+		cp = (char *)np;
 	}
 	if (*cp && (*cp != ':')) {
 	    err = EINVAL;

Modified: head/sys/boot/i386/libi386/pxe.c
==============================================================================
--- head/sys/boot/i386/libi386/pxe.c	Mon Jan 14 13:06:35 2013	(r245423)
+++ head/sys/boot/i386/libi386/pxe.c	Mon Jan 14 15:05:22 2013	(r245424)
@@ -88,6 +88,12 @@ static int	pxe_netif_get(struct iodesc *
 static int	pxe_netif_put(struct iodesc *desc, void *pkt, size_t len);
 static void	pxe_netif_end(struct netif *nif);
 
+#ifdef OLD_NFSV2
+int nfs_getrootfh(struct iodesc*, char*, u_char*);
+#else
+int nfs_getrootfh(struct iodesc*, char*, uint32_t*, u_char*);
+#endif
+
 extern struct netif_stats	pxe_st[];
 extern u_int16_t		__bangpxeseg;
 extern u_int16_t		__bangpxeoff;