From 1ccd85363abc2600565c4e1acfcefd0628997538 Mon Sep 17 00:00:00 2001 From: dholland Date: Sat, 6 Aug 2011 20:29:37 +0000 Subject: Remove more silly casts. --- hack/hack.do.c | 6 +++--- hack/hack.do_name.c | 6 +++--- hack/hack.end.c | 6 +++--- hack/hack.engrave.c | 6 +++--- hack/hack.invent.c | 8 ++++---- hack/hack.lev.c | 16 ++++++++-------- hack/hack.mon.c | 6 +++--- hack/hack.pager.c | 6 +++--- hack/hack.read.c | 6 +++--- hack/hack.shk.c | 12 ++++++------ hack/hack.steal.c | 6 +++--- hack/hack.topl.c | 6 +++--- hack/hack.worm.c | 6 +++--- 13 files changed, 48 insertions(+), 48 deletions(-) (limited to 'hack') diff --git a/hack/hack.do.c b/hack/hack.do.c index 87d7f8a7..53f6df43 100644 --- a/hack/hack.do.c +++ b/hack/hack.do.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.do.c,v 1.10 2011/07/20 07:04:30 dholland Exp $ */ +/* $NetBSD: hack.do.c,v 1.11 2011/08/06 20:29:37 dholland Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.do.c,v 1.10 2011/07/20 07:04:30 dholland Exp $"); +__RCSID("$NetBSD: hack.do.c,v 1.11 2011/08/06 20:29:37 dholland Exp $"); #endif /* not lint */ /* Contains code for 'd', 'D' (drop), '>', '<' (up, down) and 't' (throw) */ @@ -101,7 +101,7 @@ drop(struct obj *obj) if (Invisible) newsym(u.ux, u.uy); } - free((char *) obj); + free(obj); return (1); } if (obj->owornmask & (W_ARMOR | W_RING)) { diff --git a/hack/hack.do_name.c b/hack/hack.do_name.c index 31ca88e5..9cf5e40b 100644 --- a/hack/hack.do_name.c +++ b/hack/hack.do_name.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.do_name.c,v 1.11 2009/08/12 07:28:40 dholland Exp $ */ +/* $NetBSD: hack.do_name.c,v 1.12 2011/08/06 20:29:37 dholland Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.do_name.c,v 1.11 2009/08/12 07:28:40 dholland Exp $"); +__RCSID("$NetBSD: hack.do_name.c,v 1.12 2011/08/06 20:29:37 dholland Exp $"); #endif /* not lint */ #include @@ -211,7 +211,7 @@ do_oname(struct obj *obj) #if 0 obfree(obj, otmp2); /* now unnecessary: no pointers on bill */ #endif - free((char *) obj); /* let us hope nobody else saved a pointer */ + free(obj); /* let us hope nobody else saved a pointer */ } int diff --git a/hack/hack.end.c b/hack/hack.end.c index 2e32fc7d..8e57ff7e 100644 --- a/hack/hack.end.c +++ b/hack/hack.end.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.end.c,v 1.15 2011/08/06 20:18:26 dholland Exp $ */ +/* $NetBSD: hack.end.c,v 1.16 2011/08/06 20:29:37 dholland Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.end.c,v 1.15 2011/08/06 20:18:26 dholland Exp $"); +__RCSID("$NetBSD: hack.end.c,v 1.16 2011/08/06 20:29:37 dholland Exp $"); #endif /* not lint */ #include @@ -804,7 +804,7 @@ prscore(int argc, char **argv) break; } } - free((char *) t1); + free(t1); } #ifdef nonsense totchars[totcharct] = 0; diff --git a/hack/hack.engrave.c b/hack/hack.engrave.c index 4cd68bb9..2e00b882 100644 --- a/hack/hack.engrave.c +++ b/hack/hack.engrave.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.engrave.c,v 1.11 2011/08/06 20:18:26 dholland Exp $ */ +/* $NetBSD: hack.engrave.c,v 1.12 2011/08/06 20:29:37 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.11 2011/08/06 20:18:26 dholland Exp $"); +__RCSID("$NetBSD: hack.engrave.c,v 1.12 2011/08/06 20:29:37 dholland Exp $"); #endif /* not lint */ #include @@ -392,5 +392,5 @@ del_engr(struct engr *ep) return; fnd: ; } - free((char *) ep); + free(ep); } diff --git a/hack/hack.invent.c b/hack/hack.invent.c index a259c855..0032cdb9 100644 --- a/hack/hack.invent.c +++ b/hack/hack.invent.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.invent.c,v 1.15 2011/05/23 22:53:25 joerg Exp $ */ +/* $NetBSD: hack.invent.c,v 1.16 2011/08/06 20:29:37 dholland Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.invent.c,v 1.15 2011/05/23 22:53:25 joerg Exp $"); +__RCSID("$NetBSD: hack.invent.c,v 1.16 2011/08/06 20:29:37 dholland Exp $"); #endif /* not lint */ #include @@ -237,7 +237,7 @@ freegold(struct gold *gold) } gtmp->ngold = gold->ngold; } - free((char *) gold); + free(gold); } void @@ -251,7 +251,7 @@ deltrap(struct trap *trap) for (ttmp = ftrap; ttmp->ntrap != trap; ttmp = ttmp->ntrap); ttmp->ntrap = trap->ntrap; } - free((char *) trap); + free(trap); } struct wseg *m_atseg; diff --git a/hack/hack.lev.c b/hack/hack.lev.c index 50e6483e..daeec6f4 100644 --- a/hack/hack.lev.c +++ b/hack/hack.lev.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.lev.c,v 1.12 2011/08/06 20:00:33 dholland Exp $ */ +/* $NetBSD: hack.lev.c,v 1.13 2011/08/06 20:29:37 dholland Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.lev.c,v 1.12 2011/08/06 20:00:33 dholland Exp $"); +__RCSID("$NetBSD: hack.lev.c,v 1.13 2011/08/06 20:29:37 dholland Exp $"); #endif /* not lint */ #include @@ -150,7 +150,7 @@ saveobjchn(int fd, struct obj *otmp) xl = otmp->onamelth; bwrite(fd, (char *) &xl, sizeof(int)); bwrite(fd, (char *) otmp, xl + sizeof(struct obj)); - free((char *) otmp); + free(otmp); otmp = otmp2; } bwrite(fd, (char *) &minusone, sizeof(int)); @@ -173,7 +173,7 @@ savemonchn(int fd, struct monst *mtmp) bwrite(fd, (char *) mtmp, xl + sizeof(struct monst)); if (mtmp->minvent) saveobjchn(fd, mtmp->minvent); - free((char *) mtmp); + free(mtmp); mtmp = mtmp2; } bwrite(fd, (char *) &minusone, sizeof(int)); @@ -186,7 +186,7 @@ savegoldchn(int fd, struct gold *gold) while (gold) { gold2 = gold->ngold; bwrite(fd, (char *) gold, sizeof(struct gold)); - free((char *) gold); + free(gold); gold = gold2; } bwrite(fd, nul, sizeof(struct gold)); @@ -199,7 +199,7 @@ savetrapchn(int fd, struct trap *trap) while (trap) { trap2 = trap->ntrap; bwrite(fd, (char *) trap, sizeof(struct trap)); - free((char *) trap); + free(trap); trap = trap2; } bwrite(fd, nul, sizeof(struct trap)); @@ -273,7 +273,7 @@ getlev(int fd, int pid, xchar lev) gold = newgold(); mread(fd, gold, sizeof(struct gold)); } - free((char *) gold); + free(gold); trap = newtrap(); mread(fd, trap, sizeof(struct trap)); while (trap->tx) { @@ -282,7 +282,7 @@ getlev(int fd, int pid, xchar lev) trap = newtrap(); mread(fd, trap, sizeof(struct trap)); } - free((char *) trap); + free(trap); fobj = restobjchn(fd); billobjs = restobjchn(fd); rest_engravings(fd); diff --git a/hack/hack.mon.c b/hack/hack.mon.c index dd56e6bb..ef80361c 100644 --- a/hack/hack.mon.c +++ b/hack/hack.mon.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.mon.c,v 1.12 2011/08/06 20:24:35 dholland Exp $ */ +/* $NetBSD: hack.mon.c,v 1.13 2011/08/06 20:29:37 dholland Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.mon.c,v 1.12 2011/08/06 20:24:35 dholland Exp $"); +__RCSID("$NetBSD: hack.mon.c,v 1.13 2011/08/06 20:29:37 dholland Exp $"); #endif /* not lint */ #include @@ -765,7 +765,7 @@ dmonsfree(void) struct monst *mtmp; while ((mtmp = fdmon) != NULL) { fdmon = mtmp->nmon; - free((char *) mtmp); + free(mtmp); } } diff --git a/hack/hack.pager.c b/hack/hack.pager.c index 6384f7e7..af7ac54c 100644 --- a/hack/hack.pager.c +++ b/hack/hack.pager.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.pager.c,v 1.17 2011/08/06 20:18:26 dholland Exp $ */ +/* $NetBSD: hack.pager.c,v 1.18 2011/08/06 20:29:37 dholland Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.pager.c,v 1.17 2011/08/06 20:18:26 dholland Exp $"); +__RCSID("$NetBSD: hack.pager.c,v 1.18 2011/08/06 20:29:37 dholland Exp $"); #endif /* not lint */ /* This file contains the command routine dowhatis() and a pager. */ @@ -348,7 +348,7 @@ cornline(int mode, const char *text) cleanup: while ((tl = texthead) != NULL) { texthead = tl->next_line; - free((char *) tl); + free(tl); } } diff --git a/hack/hack.read.c b/hack/hack.read.c index 3a232eed..27890e2f 100644 --- a/hack/hack.read.c +++ b/hack/hack.read.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.read.c,v 1.10 2009/08/12 07:28:41 dholland Exp $ */ +/* $NetBSD: hack.read.c,v 1.11 2011/08/06 20:29:37 dholland Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.read.c,v 1.10 2009/08/12 07:28:41 dholland Exp $"); +__RCSID("$NetBSD: hack.read.c,v 1.11 2011/08/06 20:29:37 dholland Exp $"); #endif /* not lint */ #include @@ -203,7 +203,7 @@ doread(void) Punished = 0; freeobj(uchain); unpobj(uchain); - free((char *) uchain); + free(uchain); uball->spe = 0; uball->owornmask &= ~W_BALL; uchain = uball = (struct obj *) 0; diff --git a/hack/hack.shk.c b/hack/hack.shk.c index 26f860c7..ee873518 100644 --- a/hack/hack.shk.c +++ b/hack/hack.shk.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.shk.c,v 1.11 2009/08/12 07:28:41 dholland Exp $ */ +/* $NetBSD: hack.shk.c,v 1.12 2011/08/06 20:29:37 dholland Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.shk.c,v 1.11 2009/08/12 07:28:41 dholland Exp $"); +__RCSID("$NetBSD: hack.shk.c,v 1.12 2011/08/06 20:29:37 dholland Exp $"); #endif /* not lint */ #include @@ -89,7 +89,7 @@ struct obj *billobjs = 0; void obfree(struct obj *obj, struct obj *merge) { - free((char *) obj); + free(obj); } int inshop(void) { @@ -237,7 +237,7 @@ setpaid(void) obj->unpaid = 0; while ((obj = billobjs) != NULL) { billobjs = obj->nobj; - free((char *) obj); + free(obj); } ESHK(shopkeeper)->billct = 0; } @@ -419,7 +419,7 @@ obfree(struct obj *obj, struct obj *merge) *bp = bill[ESHK(shopkeeper)->billct]; } } - free((char *) obj); + free(obj); } static void @@ -603,7 +603,7 @@ dopayobj(struct bill_x *bp) else pline("Error in shopkeeper administration."); } - free((char *) obj); + free(obj); } return (1); } diff --git a/hack/hack.steal.c b/hack/hack.steal.c index 06d47bf3..cceb5008 100644 --- a/hack/hack.steal.c +++ b/hack/hack.steal.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.steal.c,v 1.7 2009/08/12 07:28:41 dholland Exp $ */ +/* $NetBSD: hack.steal.c,v 1.8 2011/08/06 20:29:37 dholland Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.steal.c,v 1.7 2009/08/12 07:28:41 dholland Exp $"); +__RCSID("$NetBSD: hack.steal.c,v 1.8 2011/08/06 20:29:37 dholland Exp $"); #endif /* not lint */ #include @@ -216,7 +216,7 @@ steal(struct monst *mtmp) if (Punished && otmp == uball) { Punished = 0; freeobj(uchain); - free((char *) uchain); + free(uchain); uchain = (struct obj *) 0; uball->spe = 0; uball = (struct obj *) 0; /* superfluous */ diff --git a/hack/hack.topl.c b/hack/hack.topl.c index c24b70fb..d99b76f8 100644 --- a/hack/hack.topl.c +++ b/hack/hack.topl.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.topl.c,v 1.13 2011/08/06 20:18:26 dholland Exp $ */ +/* $NetBSD: hack.topl.c,v 1.14 2011/08/06 20:29:37 dholland Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.topl.c,v 1.13 2011/08/06 20:18:26 dholland Exp $"); +__RCSID("$NetBSD: hack.topl.c,v 1.14 2011/08/06 20:29:37 dholland Exp $"); #endif /* not lint */ #include @@ -133,7 +133,7 @@ remember_topl(void) tl = tl->next_topl; } if (tl && tl->next_topl) { - free((char *) tl->next_topl); + free(tl->next_topl); tl->next_topl = 0; } } diff --git a/hack/hack.worm.c b/hack/hack.worm.c index 2a606be1..54feb622 100644 --- a/hack/hack.worm.c +++ b/hack/hack.worm.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.worm.c,v 1.8 2009/08/12 07:28:41 dholland Exp $ */ +/* $NetBSD: hack.worm.c,v 1.9 2011/08/06 20:29:37 dholland Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.worm.c,v 1.8 2009/08/12 07:28:41 dholland Exp $"); +__RCSID("$NetBSD: hack.worm.c,v 1.9 2011/08/06 20:29:37 dholland Exp $"); #endif /* not lint */ #include @@ -279,6 +279,6 @@ remseg(struct wseg *wtmp) { if (wtmp->wdispl) newsym(wtmp->wx, wtmp->wy); - free((char *) wtmp); + free(wtmp); } #endif /* NOWORM */ -- cgit v1.2.3-56-ge451