Remove SHORTLEN and LONGLEN defines; use sizeof() properly instead.

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

diff --git a/hack/hack.o_init.c b/hack/hack.o_init.c
index 6db5a45b92e8bd4ee754512c148bed84e3793243..9ca796e2f23c63946de1a2e93a68e34af0f7a5a3 100644 (file)
--- a/hack/hack.o_init.c
+++ b/hack/hack.o_init.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: hack.o_init.c,v 1.12 2011/08/06 20:18:26 dholland Exp $        */
+/*     $NetBSD: hack.o_init.c,v 1.14 2011/08/06 20:42:43 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.12 2011/08/06 20:18:26 dholland Exp $");
+__RCSID("$NetBSD: hack.o_init.c,v 1.14 2011/08/06 20:42:43 dholland Exp $");
 #endif                         /* not lint */
 
 #include <string.h>
@@ -181,8 +181,8 @@ savenames(int fd)
 {
        int             i;
        size_t          len;
-       bwrite(fd, (char *) bases, sizeof bases);
-       bwrite(fd, (char *) objects, sizeof objects);
+       bwrite(fd, bases, sizeof bases);
+       bwrite(fd, objects, sizeof objects);
        /*
         * as long as we use only one version of Hack/Quest we need not save
         * oc_name and oc_descr, but we must save oc_uname for all objects
@@ -190,7 +190,7 @@ savenames(int fd)
        for (i = 0; i < SIZE(objects); i++) {
                if (objects[i].oc_uname) {
                        len = strlen(objects[i].oc_uname) + 1;
-                       bwrite(fd, (char *) &len, sizeof len);
+                       bwrite(fd, &len, sizeof len);
                        bwrite(fd, objects[i].oc_uname, len);
                }
        }
@@ -228,9 +228,9 @@ dodiscovered(void)
        }
        if (ct == 0) {
                pline("You haven't discovered anything yet...");
-               cornline(3, (char *) 0);
+               cornline(3, NULL);
        } else
-               cornline(2, (char *) 0);
+               cornline(2, NULL);
 
        return (0);
 }