diff options
| author | sbruno <sbruno@FreeBSD.org> | 2013-01-14 15:05:22 +0000 |
|---|---|---|
| committer | sbruno <sbruno@FreeBSD.org> | 2013-01-14 15:05:22 +0000 |
| commit | 116782d430313a251c4282eb08899d97e0a5bcb2 (patch) | |
| tree | 74a54be0f36ec29b58c7d9c8e6185506a2141e6a /sys/boot/i386 | |
| parent | 163aff2e8d27290d49539f29ea022390ed1c1875 (diff) | |
| download | FreeBSD-src-116782d430313a251c4282eb08899d97e0a5bcb2.zip FreeBSD-src-116782d430313a251c4282eb08899d97e0a5bcb2.tar.gz | |
Quiesce some clang warnings while we're here doing stuff.
Submitted by: Hiren Panchasara <hiren.panchasara@gmail.com>
Obtained from: Yahoo! Inc
Diffstat (limited to 'sys/boot/i386')
| -rw-r--r-- | sys/boot/i386/libi386/bootinfo64.c | 3 | ||||
| -rw-r--r-- | sys/boot/i386/libi386/devicename.c | 2 | ||||
| -rw-r--r-- | sys/boot/i386/libi386/pxe.c | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/sys/boot/i386/libi386/bootinfo64.c b/sys/boot/i386/libi386/bootinfo64.c index 0c6d077..617414e 100644 --- a/sys/boot/i386/libi386/bootinfo64.c +++ b/sys/boot/i386/libi386/bootinfo64.c @@ -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(); diff --git a/sys/boot/i386/libi386/devicename.c b/sys/boot/i386/libi386/devicename.c index 15889d3..c7705d7 100644 --- a/sys/boot/i386/libi386/devicename.c +++ b/sys/boot/i386/libi386/devicename.c @@ -128,7 +128,7 @@ i386_parsedev(struct i386_devdesc **dev, const char *devspec, const char **path) goto fail; } } else { - cp = np; + cp = (char *)np; } if (*cp && (*cp != ':')) { err = EINVAL; diff --git a/sys/boot/i386/libi386/pxe.c b/sys/boot/i386/libi386/pxe.c index e4ec5c0..49814dd 100644 --- a/sys/boot/i386/libi386/pxe.c +++ b/sys/boot/i386/libi386/pxe.c @@ -88,6 +88,12 @@ static int pxe_netif_get(struct iodesc *desc, void *pkt, size_t len, 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; |
