Module Name: src
Committed By: dholland
Date: Sat Aug 6 20:18:26 UTC 2011
Modified Files:
src/games/hack: alloc.c def.gen.h def.gold.h def.monst.h def.obj.h
def.trap.h def.wseg.h extern.h hack.end.c hack.engrave.c hack.h
hack.o_init.c hack.pager.c hack.rumors.c hack.topl.c
Log Message:
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.)
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/games/hack/alloc.c src/games/hack/hack.rumors.c
cvs rdiff -u -r1.5 -r1.6 src/games/hack/def.gen.h src/games/hack/def.gold.h \
src/games/hack/def.obj.h src/games/hack/def.trap.h \
src/games/hack/def.wseg.h
cvs rdiff -u -r1.7 -r1.8 src/games/hack/def.monst.h
cvs rdiff -u -r1.15 -r1.16 src/games/hack/extern.h src/games/hack/hack.h
cvs rdiff -u -r1.14 -r1.15 src/games/hack/hack.end.c
cvs rdiff -u -r1.10 -r1.11 src/games/hack/hack.engrave.c
cvs rdiff -u -r1.11 -r1.12 src/games/hack/hack.o_init.c
cvs rdiff -u -r1.16 -r1.17 src/games/hack/hack.pager.c
cvs rdiff -u -r1.12 -r1.13 src/games/hack/hack.topl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/hack/alloc.c
diff -u src/games/hack/alloc.c:1.8 src/games/hack/alloc.c:1.9
--- src/games/hack/alloc.c:1.8 Sun Jan 17 22:55:20 2010
+++ src/games/hack/alloc.c Sat Aug 6 20:18:26 2011
@@ -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 */
Index: src/games/hack/hack.rumors.c
diff -u src/games/hack/hack.rumors.c:1.8 src/games/hack/hack.rumors.c:1.9
--- src/games/hack/hack.rumors.c:1.8 Mon May 23 22:53:25 2011
+++ src/games/hack/hack.rumors.c Sat Aug 6 20:18:26 2011
@@ -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 @@
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;
}
Index: src/games/hack/def.gen.h
diff -u src/games/hack/def.gen.h:1.5 src/games/hack/def.gen.h:1.6
--- src/games/hack/def.gen.h:1.5 Wed Apr 2 18:36:34 2003
+++ src/games/hack/def.gen.h Sat Aug 6 20:18:26 2011
@@ -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 @@
#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_ */
Index: src/games/hack/def.gold.h
diff -u src/games/hack/def.gold.h:1.5 src/games/hack/def.gold.h:1.6
--- src/games/hack/def.gold.h:1.5 Wed Apr 2 18:36:34 2003
+++ src/games/hack/def.gold.h Sat Aug 6 20:18:26 2011
@@ -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 @@
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_ */
Index: src/games/hack/def.obj.h
diff -u src/games/hack/def.obj.h:1.5 src/games/hack/def.obj.h:1.6
--- src/games/hack/def.obj.h:1.5 Wed Apr 2 18:36:34 2003
+++ src/games/hack/def.obj.h Sat Aug 6 20:18:26 2011
@@ -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 @@
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_ */
Index: src/games/hack/def.trap.h
diff -u src/games/hack/def.trap.h:1.5 src/games/hack/def.trap.h:1.6
--- src/games/hack/def.trap.h:1.5 Wed Apr 2 18:36:35 2003
+++ src/games/hack/def.trap.h Sat Aug 6 20:18:26 2011
@@ -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 @@
};
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
Index: src/games/hack/def.wseg.h
diff -u src/games/hack/def.wseg.h:1.5 src/games/hack/def.wseg.h:1.6
--- src/games/hack/def.wseg.h:1.5 Wed Apr 2 18:36:35 2003
+++ src/games/hack/def.wseg.h Sat Aug 6 20:18:26 2011
@@ -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 @@
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_ */
Index: src/games/hack/def.monst.h
diff -u src/games/hack/def.monst.h:1.7 src/games/hack/def.monst.h:1.8
--- src/games/hack/def.monst.h:1.7 Wed Apr 2 18:36:34 2003
+++ src/games/hack/def.monst.h Sat Aug 6 20:18:26 2011
@@ -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 @@
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;
Index: src/games/hack/extern.h
diff -u src/games/hack/extern.h:1.15 src/games/hack/extern.h:1.16
--- src/games/hack/extern.h:1.15 Sat Aug 6 20:00:33 2011
+++ src/games/hack/extern.h Sat Aug 6 20:18:26 2011
@@ -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);
Index: src/games/hack/hack.h
diff -u src/games/hack/hack.h:1.15 src/games/hack/hack.h:1.16
--- src/games/hack/hack.h:1.15 Sat Aug 6 19:47:54 2011
+++ src/games/hack/hack.h Sat Aug 6 20:18:26 2011
@@ -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 @@
#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
Index: src/games/hack/hack.end.c
diff -u src/games/hack/hack.end.c:1.14 src/games/hack/hack.end.c:1.15
--- src/games/hack/hack.end.c:1.14 Wed Feb 3 15:34:38 2010
+++ src/games/hack/hack.end.c Sat Aug 6 20:18:26 2011
@@ -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 @@
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
Index: src/games/hack/hack.engrave.c
diff -u src/games/hack/hack.engrave.c:1.10 src/games/hack/hack.engrave.c:1.11
--- src/games/hack/hack.engrave.c:1.10 Sat Aug 6 20:00:33 2011
+++ src/games/hack/hack.engrave.c Sat Aug 6 20:18:26 2011
@@ -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 @@
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 @@
}
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 @@
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;
Index: src/games/hack/hack.o_init.c
diff -u src/games/hack/hack.o_init.c:1.11 src/games/hack/hack.o_init.c:1.12
--- src/games/hack/hack.o_init.c:1.11 Sat Aug 6 20:00:33 2011
+++ src/games/hack/hack.o_init.c Sat Aug 6 20:18:26 2011
@@ -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 @@
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);
}
}
Index: src/games/hack/hack.pager.c
diff -u src/games/hack/hack.pager.c:1.16 src/games/hack/hack.pager.c:1.17
--- src/games/hack/hack.pager.c:1.16 Sat Aug 6 19:53:24 2011
+++ src/games/hack/hack.pager.c Sat Aug 6 20:18:26 2011
@@ -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 @@
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 @@
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);
Index: src/games/hack/hack.topl.c
diff -u src/games/hack/hack.topl.c:1.12 src/games/hack/hack.topl.c:1.13
--- src/games/hack/hack.topl.c:1.12 Wed Aug 12 07:28:41 2009
+++ src/games/hack/hack.topl.c Sat Aug 6 20:18:26 2011
@@ -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 @@
!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);
