goto considered harmful

[bsdgames-darwin.git] / hack / hack.shk.c

diff --git a/hack/hack.shk.c b/hack/hack.shk.c
index 26f860c78e81869f1cc2cb38a61d5184a60d0dd7..7fa85b74f679e76bff099bfbd407723657ed938a 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.14 2012/06/19 05:46:08 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.14 2012/06/19 05:46:08 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);
 }
@@ -890,6 +890,7 @@ getprice(struct obj *obj)
                break;
        case CHAIN_SYM:
                pline("Strange ..., carrying a chain?");
+               /* FALLTHROUGH */
        case BALL_SYM:
                tmp = 10;
                break;
@@ -1102,8 +1103,7 @@ notonl_ok:
 
 /* He is digging in the shop. */
 void
-shopdig(fall)
-       int             fall;
+shopdig(int fall)
 {
        if (!fall) {
                if (u.utraptype == TT_PIT)