From 9454bf2a02784b7f28fbab922d3d8b56b2193786 Mon Sep 17 00:00:00 2001 From: dholland Date: Sat, 6 Aug 2011 20:18:26 +0000 Subject: 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.) --- hack/alloc.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'hack/alloc.c') 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 #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 #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 */ -- cgit v1.2.3-56-ge451