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.)

15 files changed, 48 insertions, 49 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 */
diff --git a/hack/def.gen.h b/hack/def.gen.h
index ea9fe655..116caf43 100644
--- a/hack/def.gen.h
+++ b/hack/def.gen.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: def.gen.h,v 1.5 2003/04/02 18:36:34 jsm Exp $	*/
+/*	$NetBSD: def.gen.h,v 1.6 2011/08/06 20:18:26 dholland Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -73,5 +73,5 @@ struct gen {
 #define	ONCE	0100
 };
 extern struct gen *fgold, *ftrap;
-#define newgen()	(struct gen *) alloc(sizeof(struct gen))
+#define newgen()	((struct gen *) alloc(sizeof(struct gen)))
 #endif /* _DEF_GEN_H_ */
diff --git a/hack/def.gold.h b/hack/def.gold.h
index e526ef7e..129b8550 100644
--- a/hack/def.gold.h
+++ b/hack/def.gold.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: def.gold.h,v 1.5 2003/04/02 18:36:34 jsm Exp $	*/
+/*	$NetBSD: def.gold.h,v 1.6 2011/08/06 20:18:26 dholland Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -69,6 +69,6 @@ struct gold {
 	long amount;
 };
 
-#define newgold()	(struct gold *) alloc(sizeof(struct gold))
+#define newgold()	((struct gold *) alloc(sizeof(struct gold)))
 extern struct gold *fgold;
 #endif /* _DEF_GOLD_H_ */
diff --git a/hack/def.monst.h b/hack/def.monst.h
index 0176ac33..f8481c2b 100644
--- a/hack/def.monst.h
+++ b/hack/def.monst.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: def.monst.h,v 1.7 2003/04/02 18:36:34 jsm Exp $	*/
+/*	$NetBSD: def.monst.h,v 1.8 2011/08/06 20:18:26 dholland Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -107,7 +107,7 @@ struct monst {
 	long mextra[1];		/* monster dependent info */
 };
 
-#define newmonst(xl)	(struct monst *) alloc((unsigned)(xl) + sizeof(struct monst))
+#define newmonst(xl)	((struct monst *) alloc((xl) + sizeof(struct monst)))
 
 extern struct monst *fmon;
 extern struct monst *fallen_down;
diff --git a/hack/def.obj.h b/hack/def.obj.h
index b4bef62e..9e0a2f22 100644
--- a/hack/def.obj.h
+++ b/hack/def.obj.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: def.obj.h,v 1.5 2003/04/02 18:36:34 jsm Exp $	*/
+/*	$NetBSD: def.obj.h,v 1.6 2011/08/06 20:18:26 dholland Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -105,7 +105,7 @@ struct obj {
 
 extern struct obj *fobj;
 
-#define newobj(xl)	(struct obj *) alloc((unsigned)(xl) + sizeof(struct obj))
+#define newobj(xl)	((struct obj *) alloc((xl) + sizeof(struct obj)))
 #define	ONAME(otmp)	((char *) otmp->oextra)
 #define	OGOLD(otmp)	(otmp->oextra[0])
 #endif /* _DEF_OBJ_H_ */
diff --git a/hack/def.trap.h b/hack/def.trap.h
index 65213320..b3850d66 100644
--- a/hack/def.trap.h
+++ b/hack/def.trap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: def.trap.h,v 1.5 2003/04/02 18:36:35 jsm Exp $	*/
+/*	$NetBSD: def.trap.h,v 1.6 2011/08/06 20:18:26 dholland Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -72,7 +72,7 @@ struct trap {
 };
 
 extern struct trap *ftrap;
-#define newtrap()	(struct trap *) alloc(sizeof(struct trap))
+#define newtrap()	((struct trap *) alloc(sizeof(struct trap)))
 
 /* various kinds of traps */
 #define BEAR_TRAP	0
diff --git a/hack/def.wseg.h b/hack/def.wseg.h
index df79b1d1..36469ffd 100644
--- a/hack/def.wseg.h
+++ b/hack/def.wseg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: def.wseg.h,v 1.5 2003/04/02 18:36:35 jsm Exp $	*/
+/*	$NetBSD: def.wseg.h,v 1.6 2011/08/06 20:18:26 dholland Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -71,6 +71,6 @@ struct wseg {
 	unsigned wdispl:1;
 };
 
-#define newseg()	(struct wseg *) alloc(sizeof(struct wseg))
+#define newseg()	((struct wseg *) alloc(sizeof(struct wseg)))
 #endif /* NOWORM */
 #endif /* _DEF_WSEG_H_ */
diff --git a/hack/extern.h b/hack/extern.h
index a6ac46d2..32bd5098 100644
--- a/hack/extern.h
+++ b/hack/extern.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.15 2011/08/06 20:00:33 dholland Exp $	*/
+/*	$NetBSD: extern.h,v 1.16 2011/08/06 20:18:26 dholland Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 #include <stdio.h>
 
 /* alloc.c */
-long *alloc(unsigned);
+void *alloc(size_t);
 
 /* hack.apply.c */
 int doapply(void);
diff --git a/hack/hack.end.c b/hack/hack.end.c
index 6d972497..2e32fc7d 100644
--- a/hack/hack.end.c
+++ b/hack/hack.end.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.end.c,v 1.14 2010/02/03 15:34:38 roy Exp $	*/
+/*	$NetBSD: hack.end.c,v 1.15 2011/08/06 20:18:26 dholland Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.end.c,v 1.14 2010/02/03 15:34:38 roy Exp $");
+__RCSID("$NetBSD: hack.end.c,v 1.15 2011/08/06 20:18:26 dholland Exp $");
 #endif				/* not lint */
 
 #include <signal.h>
@@ -300,7 +300,7 @@ done(const char *st1)
 	exit(0);
 }
 
-#define newttentry() (struct toptenentry *) alloc(sizeof(struct toptenentry))
+#define newttentry() ((struct toptenentry *) alloc(sizeof(struct toptenentry)))
 #define	NAMSZ	8
 #define	DTHSZ	40
 #define	PERSMAX	1
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 <sys/cdefs.h>
 #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 <stdlib.h>
@@ -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, &lth, 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;
diff --git a/hack/hack.h b/hack/hack.h
index 827b855e..575b00ef 100644
--- a/hack/hack.h
+++ b/hack/hack.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.h,v 1.15 2011/08/06 19:47:54 dholland Exp $	*/
+/*	$NetBSD: hack.h,v 1.16 2011/08/06 20:18:26 dholland Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -91,7 +91,7 @@ typedef struct {
 #include	"def.rm.h"
 #include	"def.permonst.h"
 
-#define	newstring(x)	(char *) alloc((unsigned)(x))
+#define	newstring(x)	((char *) alloc(x))
 #include "hack.onames.h"
 
 #define ON 1
diff --git a/hack/hack.o_init.c b/hack/hack.o_init.c
index 7b38ab16..6db5a45b 100644
--- a/hack/hack.o_init.c
+++ b/hack/hack.o_init.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.o_init.c,v 1.11 2011/08/06 20:00:33 dholland Exp $	*/
+/*	$NetBSD: hack.o_init.c,v 1.12 2011/08/06 20:18:26 dholland Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.o_init.c,v 1.11 2011/08/06 20:00:33 dholland Exp $");
+__RCSID("$NetBSD: hack.o_init.c,v 1.12 2011/08/06 20:18:26 dholland Exp $");
 #endif				/* not lint */
 
 #include <string.h>
@@ -206,7 +206,7 @@ restnames(int fd)
 	for (i = 0; i < SIZE(objects); i++)
 		if (objects[i].oc_uname) {
 			mread(fd, &len, sizeof len);
-			objects[i].oc_uname = (char *) alloc(len);
+			objects[i].oc_uname = alloc(len);
 			mread(fd, objects[i].oc_uname, len);
 		}
 }
diff --git a/hack/hack.pager.c b/hack/hack.pager.c
index 2043b919..6384f7e7 100644
--- a/hack/hack.pager.c
+++ b/hack/hack.pager.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.pager.c,v 1.16 2011/08/06 19:53:24 dholland Exp $	*/
+/*	$NetBSD: hack.pager.c,v 1.17 2011/08/06 20:18:26 dholland Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.pager.c,v 1.16 2011/08/06 19:53:24 dholland Exp $");
+__RCSID("$NetBSD: hack.pager.c,v 1.17 2011/08/06 20:18:26 dholland Exp $");
 #endif				/* not lint */
 
 /* This file contains the command routine dowhatis() and a pager. */
@@ -150,7 +150,7 @@ page_more(FILE *fp, int strip)
 	sig_t           prevsig = signal(SIGINT, intruph);
 
 	set_pager(0);
-	bufr = (char *) alloc((unsigned) CO);
+	bufr = alloc(CO);
 	bufr[CO - 1] = 0;
 	while (fgets(bufr, CO - 1, fp) && (!strip || *bufr == '\t') && !got_intrup) {
 		ep = strchr(bufr, '\n');
@@ -289,8 +289,7 @@ cornline(int mode, const char *text)
 		len = strlen(text);
 		if (len > maxlen)
 			maxlen = len;
-		tl = (struct line *)
-			alloc((unsigned) (len + sizeof(struct line) + 1));
+		tl = alloc(len + sizeof(*tl) + 1);
 		tl->next_line = 0;
 		tl->line_text = (char *) (tl + 1);
 		(void) strcpy(tl->line_text, text);
diff --git a/hack/hack.rumors.c b/hack/hack.rumors.c
index be0f0bba..757c5a63 100644
--- a/hack/hack.rumors.c
+++ b/hack/hack.rumors.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.rumors.c,v 1.8 2011/05/23 22:53:25 joerg Exp $	*/
+/*	$NetBSD: hack.rumors.c,v 1.9 2011/08/06 20:18:26 dholland Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.rumors.c,v 1.8 2011/05/23 22:53:25 joerg Exp $");
+__RCSID("$NetBSD: hack.rumors.c,v 1.9 2011/08/06 20:18:26 dholland Exp $");
 #endif				/* not lint */
 
 #include "hack.h"	/* for RUMORFILE and BSD (strchr) */
@@ -88,7 +88,7 @@ init_rumors(FILE *rumf)
 		n_rumors++;
 	rewind(rumf);
 	i = n_rumors / CHARSZ;
-	usedbits = (char *) alloc((unsigned) (i + 1));
+	usedbits = alloc(i + 1);
 	for (; i >= 0; i--)
 		usedbits[i] = 0;
 }
diff --git a/hack/hack.topl.c b/hack/hack.topl.c
index e5b8a856..c24b70fb 100644
--- a/hack/hack.topl.c
+++ b/hack/hack.topl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.topl.c,v 1.12 2009/08/12 07:28:41 dholland Exp $	*/
+/*	$NetBSD: hack.topl.c,v 1.13 2011/08/06 20:18:26 dholland Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.topl.c,v 1.12 2009/08/12 07:28:41 dholland Exp $");
+__RCSID("$NetBSD: hack.topl.c,v 1.13 2011/08/06 20:18:26 dholland Exp $");
 #endif				/* not lint */
 
 #include <stdlib.h>
@@ -123,8 +123,7 @@ remember_topl(void)
 	    !strcmp(toplines, old_toplines->topl_text))
 		return;
 	last_redone_topl = 0;
-	tl = (struct topl *)
-		alloc((unsigned) (strlen(toplines) + sizeof(struct topl) + 1));
+	tl = alloc(strlen(toplines) + sizeof(*tl) + 1);
 	tl->next_topl = old_toplines;
 	tl->topl_text = (char *) (tl + 1);
 	(void) strcpy(tl->topl_text, toplines);