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.panchas...@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;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
