diff options
| author | msmith <msmith@FreeBSD.org> | 1998-10-01 17:35:08 +0000 |
|---|---|---|
| committer | msmith <msmith@FreeBSD.org> | 1998-10-01 17:35:08 +0000 |
| commit | c0b467b849546b99e70adc1adacacf3927776994 (patch) | |
| tree | d6a065de46f15b6a53841cb2ca5e93e1b2dd7f77 /lib/libstand/zalloc_malloc.c | |
| parent | d6f6d292c47946695edace7dd889bee9120a21b1 (diff) | |
| download | FreeBSD-src-c0b467b849546b99e70adc1adacacf3927776994.zip FreeBSD-src-c0b467b849546b99e70adc1adacacf3927776994.tar.gz | |
Prune unused zalloc components as recommended by Matt Dillon. Extra debugging
code is still enabled (it's not very expensive).
Diffstat (limited to 'lib/libstand/zalloc_malloc.c')
| -rw-r--r-- | lib/libstand/zalloc_malloc.c | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/lib/libstand/zalloc_malloc.c b/lib/libstand/zalloc_malloc.c index 85d2a85..6cb4953 100644 --- a/lib/libstand/zalloc_malloc.c +++ b/lib/libstand/zalloc_malloc.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: zalloc_malloc.c,v 1.1 1998/09/26 01:42:39 msmith Exp $ + * $Id: zalloc_malloc.c,v 1.2 1998/09/26 10:48:50 dfr Exp $ */ /* @@ -35,7 +35,7 @@ #include "zalloc_defs.h" -static MemPool MallocPool = INITPOOL("malloc", panic, znot); +static MemPool MallocPool; #ifdef DMALLOCDEBUG static int MallocMax; @@ -92,23 +92,13 @@ free(void *ptr) Guard *res = (void *)((char *)ptr - MALLOCALIGN); #ifdef USEGUARD - if (res->ga_Magic != GAMAGIC) { -#ifdef USEPANIC - panic("free(): guard1 fail @ %08lx\n", ptr); -#else - *(char *)0 = 1; -#endif - } + if (res->ga_Magic != GAMAGIC) + panic("free: guard1 fail @ %p", ptr); res->ga_Magic = -1; #endif #ifdef USEENDGUARD - if (*((char *)res + res->ga_Bytes - 1) != -2) { -#ifdef USEPANIC - panic("free(): guard2 fail @ %08lx + %d\n", ptr, res->ga_Bytes - MALLOCALIGN); -#else - *(char *)0 = 1; -#endif - } + if (*((char *)res + res->ga_Bytes - 1) != -2) + panic("free: guard2 fail @ %p + %d", ptr, res->ga_Bytes - MALLOCALIGN); *((char *)res + res->ga_Bytes - 1) = -1; #endif |
