diff options
| author |   dholland <dholland@NetBSD.org> | 2011-08-06 20:18:26 +0000 |
|---|---|---|
| committer | dholland <dholland@NetBSD.org> | 2011-08-06 20:18:26 +0000 |
| commit | 9454bf2a02784b7f28fbab922d3d8b56b2193786 (patch) | |
| tree | a5acc680f74543e2bb47b6067344e7e9e5759f5d /hack/alloc.c | |
| parent | a96166e2f80ef376b0a2cdea16f09df48fe56d8c (diff) | |
| download | bsdgames-darwin-9454bf2a02784b7f28fbab922d3d8b56b2193786.tar.gz bsdgames-darwin-9454bf2a02784b7f28fbab922d3d8b56b2193786.tar.zst bsdgames-darwin-9454bf2a02784b7f28fbab922d3d8b56b2193786.zip | |
Use the right type for the malloc wrapper function, and don't cast the
return value.
(XXX: Except for a pile of allocation macros that produce typed pointer
results; there the typechecking of the result assignment is more valuable
than the warning if the alloc function isn't declared properly. These
macros should go away.)
Diffstat (limited to 'hack/alloc.c')
| -rw-r--r-- | hack/alloc.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/hack/alloc.c b/hack/alloc.c index ed2f5630..8f2405e3 100644 --- a/hack/alloc.c +++ b/hack/alloc.c @@ -1,4 +1,4 @@ -/* $NetBSD: alloc.c,v 1.8 2010/01/17 22:55:20 wiz Exp $ */ +/* $NetBSD: alloc.c,v 1.9 2011/08/06 20:18:26 dholland Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,21 +63,22 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: alloc.c,v 1.8 2010/01/17 22:55:20 wiz Exp $"); +__RCSID("$NetBSD: alloc.c,v 1.9 2011/08/06 20:18:26 dholland Exp $"); #endif /* not lint */ #include <stdlib.h> #include "hack.h" #include "extern.h" -long * -alloc(unsigned lth) +void * +alloc(size_t len) { - long *ptr; + void *ptr; - if (!(ptr = malloc(lth))) - panic("Cannot get %d bytes", lth); - return (ptr); + ptr = malloc(len); + if (ptr == NULL) + panic("Cannot get %zu bytes", len); + return ptr; } #if 0 /* unused */ |