diff options
| author | avatar <avatar@FreeBSD.org> | 2011-07-08 01:35:33 +0000 |
|---|---|---|
| committer | avatar <avatar@FreeBSD.org> | 2011-07-08 01:35:33 +0000 |
| commit | cbb0abbaca8551d0b28a2e9050b36edd3a891bac (patch) | |
| tree | 94b1e04e03384d5c3f357f68dba10baf2bf455f4 /lib/libstand | |
| parent | 99ee90db6b9cb3b99fd5ee4dbf7ef00507b717c9 (diff) | |
| download | FreeBSD-src-cbb0abbaca8551d0b28a2e9050b36edd3a891bac.zip FreeBSD-src-cbb0abbaca8551d0b28a2e9050b36edd3a891bac.tar.gz | |
Fixing building bustage on 32 bits platforms when WARNS >= 2. Note that
this fix only applies to zalloc.c, the other part of libstand such like
qdivrem.c still gives compilation warnings on sparc64 tinderbox builds;
therefore, WARNS level isn't changed for now.
Submitted by: Garrett Cooper <yanegomi@gmail.com>
Reviewed by: bde
Diffstat (limited to 'lib/libstand')
| -rw-r--r-- | lib/libstand/zalloc.c | 14 | ||||
| -rw-r--r-- | lib/libstand/zalloc_defs.h | 1 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lib/libstand/zalloc.c b/lib/libstand/zalloc.c index 2cd71c4..f726c2e 100644 --- a/lib/libstand/zalloc.c +++ b/lib/libstand/zalloc.c @@ -154,7 +154,7 @@ zfree(MemPool *mp, void *ptr, iaddr_t bytes) if ((char *)ptr < (char *)mp->mp_Base || (char *)ptr + bytes > (char *)mp->mp_End || ((iaddr_t)ptr & MEMNODE_SIZE_MASK) != 0) - panic("zfree(%p,%ju): wild pointer", ptr, bytes); + panic("zfree(%p,%ju): wild pointer", ptr, (uintmax_t)bytes); /* * free the segment @@ -177,8 +177,10 @@ zfree(MemPool *mp, void *ptr, iaddr_t bytes) /* * range check */ - if ((char *)ptr + bytes > (char *)mn) - panic("zfree(%p,%ju): corrupt memlist1",ptr, bytes); + if ((char *)ptr + bytes > (char *)mn) { + panic("zfree(%p,%ju): corrupt memlist1", ptr, + (uintmax_t)bytes); + } /* * merge against next area or create independant area @@ -208,8 +210,10 @@ zfree(MemPool *mp, void *ptr, iaddr_t bytes) return; /* NOT REACHED */ } - if ((char *)ptr < (char *)mn + mn->mr_Bytes) - panic("zfree(%p,%ju): corrupt memlist2", ptr, bytes); + if ((char *)ptr < (char *)mn + mn->mr_Bytes) { + panic("zfree(%p,%ju): corrupt memlist2", ptr, + (uintmax_t)bytes); + } } /* * We are beyond the last MemNode, append new MemNode. Merge against diff --git a/lib/libstand/zalloc_defs.h b/lib/libstand/zalloc_defs.h index 2544f59..84a828b 100644 --- a/lib/libstand/zalloc_defs.h +++ b/lib/libstand/zalloc_defs.h @@ -39,6 +39,7 @@ #define ZALLOCDEBUG #include <string.h> +#include <sys/stdint.h> #include "stand.h" typedef uintptr_t iaddr_t; /* unsigned int same size as pointer */ |
