Remove more silly casts.

diff --git a/hack/hack.do.c b/hack/hack.do.c
index 87d7f8a7d58dbe7f5889a45f6f373cb8565713b2..53f6df43f2b31f3f2490fb9034b6d28539904c98 100644 (file)
--- 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 <sys/cdefs.h>
 #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 31ca88e5c8b19c36127e83571fb7f3cdfe11ee80..9cf5e40b60470e637b2138b5ba8768ca5de26736 100644 (file)
--- 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 <sys/cdefs.h>
 #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 <stdlib.h>
@@ -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 2e32fc7dbf7a103bfd73ed5672d24ec4c8968519..8e57ff7e4361763d1d707412af18e9b19ba64ce0 100644 (file)
--- 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 <sys/cdefs.h>
 #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 <signal.h>
@@ -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 4cd68bb964a6f16d2422170498da17d667ee9279..2e00b882af50bd9f457319a8a8622f91aa7cba52 100644 (file)
--- 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 <sys/cdefs.h>
 #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 <stdlib.h>
@@ -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 a259c855e92dd26e883d3c0ea23858644a753364..0032cdb932421cb20febf65d31b6ef2d3143ac99 100644 (file)
--- 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 <sys/cdefs.h>
 #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 <assert.h>
@@ -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 50e6483ee2d10f996605ce15e754535039289bca..daeec6f49811451b4fa9e0014f94978874c5d948 100644 (file)
--- 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 <sys/cdefs.h>
 #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 <stdlib.h>
@@ -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 dd56e6bb2c2a912a08431bee8138973777e62c2d..ef80361c0fbce39f6e7adbc3c2fa0af94fd0a8b8 100644 (file)
--- 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 <sys/cdefs.h>
 #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 <stdlib.h>
@@ -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 6384f7e7a3538bc8bad8b20662f94b26ed7c274a..af7ac54c65aa101749785ec9d12433669d17df47 100644 (file)
--- 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 <sys/cdefs.h>
 #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 3a232eedf8c2c73e0776d9d543fee66bc72ae353..27890e2f3d6cf94857f7e8b448b30b3766b03302 100644 (file)
--- 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 <sys/cdefs.h>
 #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 <stdlib.h>
@@ -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 26f860c78e81869f1cc2cb38a61d5184a60d0dd7..ee873518a53c7917026309e79453bb2ce56aa57e 100644 (file)
--- 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 <sys/cdefs.h>
 #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 <stdlib.h>
@@ -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 06d47bf37fbad12dac064c6d64082e7c61455722..cceb50086aa8a2874239c759e01ec305d5b6771b 100644 (file)
--- 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 <sys/cdefs.h>
 #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 <stdlib.h>
@@ -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 c24b70fb2201d1b32cf7727638bf8a69c258d276..d99b76f881ad76043fdbe0668651c8a3874767ee 100644 (file)
--- 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 <sys/cdefs.h>
 #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 <stdlib.h>
@@ -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 2a606be13454127cbf859da4844cf26147200cee..54feb6220d234ba8e232dc80f507167053b3a77c 100644 (file)
--- 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 <sys/cdefs.h>
 #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 <stdlib.h>
@@ -279,6 +279,6 @@ remseg(struct wseg *wtmp)
 {
        if (wtmp->wdispl)
                newsym(wtmp->wx, wtmp->wy);
-       free((char *) wtmp);
+       free(wtmp);
 }
 #endif /* NOWORM */