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/hack.engrave.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'hack/hack.engrave.c') diff --git a/hack/hack.engrave.c b/hack/hack.engrave.c index e440f9f1..4cd68bb9 100644 --- a/hack/hack.engrave.c +++ b/hack/hack.engrave.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.engrave.c,v 1.10 2011/08/06 20:00:33 dholland Exp $ */ +/* $NetBSD: hack.engrave.c,v 1.11 2011/08/06 20:18:26 dholland Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.engrave.c,v 1.10 2011/08/06 20:00:33 dholland Exp $"); +__RCSID("$NetBSD: hack.engrave.c,v 1.11 2011/08/06 20:18:26 dholland Exp $"); #endif /* not lint */ #include @@ -185,8 +185,8 @@ make_engr_at(int x, int y, const char *s) if ((ep = engr_at(x, y)) != NULL) del_engr(ep); - ep = (struct engr *) - alloc((unsigned) (sizeof(struct engr) + strlen(s) + 1)); + ep = alloc(sizeof(*ep) + strlen(s) + 1); + ep->nxt_engr = head_engr; head_engr = ep; ep->engr_x = x; @@ -316,7 +316,7 @@ doengrave(void) } if (oep) len += strlen(oep->engr_txt) + spct; - ep = (struct engr *) alloc((unsigned) (sizeof(struct engr) + len + 1)); + ep = alloc(sizeof(*ep) + len + 1); ep->nxt_engr = head_engr; head_engr = ep; ep->engr_x = u.ux; @@ -367,8 +367,8 @@ rest_engravings(int fd) mread(fd, <h, sizeof(unsigned)); if (lth == 0) return; - ep = (struct engr *) alloc(sizeof(struct engr) + lth); - mread(fd, ep, sizeof(struct engr) + lth); + ep = alloc(sizeof(*ep) + lth); + mread(fd, ep, sizeof(*ep) + lth); ep->nxt_engr = head_engr; ep->engr_txt = (char *) (ep + 1); /* Andreas Bormann */ head_engr = ep; -- cgit v1.2.3-56-ge451