Fix merge conflicts

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

diff --git a/hack/hack.save.c b/hack/hack.save.c
index 93b5794f2330cdbca066b212aa80feed12e774cc..1e93d7ef7c48f1f872712e91bfdedb92b004b55b 100644 (file)
--- a/hack/hack.save.c
+++ b/hack/hack.save.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: hack.save.c,v 1.11 2009/06/07 18:30:39 dholland Exp $  */
+/*     $NetBSD: hack.save.c,v 1.16 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.save.c,v 1.11 2009/06/07 18:30:39 dholland Exp $");
+__RCSID("$NetBSD: hack.save.c,v 1.16 2011/08/06 20:42:43 dholland Exp $");
 #endif                         /* not lint */
 
 #include <signal.h>
@@ -73,6 +73,7 @@ __RCSID("$NetBSD: hack.save.c,v 1.11 2009/06/07 18:30:39 dholland Exp $");
 #include "hack.h"
 #include "extern.h"
 
+static int dosave0(int);
 
 int
 dosave(void)
@@ -86,7 +87,7 @@ dosave(void)
 
 #ifndef NOSAVEONHANGUP
 void
-hangup(int n __unused)
+hang_up(int n __unused)
 {
        (void) dosave0(1);
        exit(1);
@@ -94,7 +95,7 @@ hangup(int n __unused)
 #endif /* NOSAVEONHANGUP */
 
 /* returns 1 if save successful */
-int
+static int
 dosave0(int hu)
 {
        int             fd, ofd;
@@ -115,17 +116,17 @@ dosave0(int hu)
        saveobjchn(fd, fcobj);
        savemonchn(fd, fallen_down);
        tmp = getuid();
-       bwrite(fd, (char *) &tmp, sizeof tmp);
-       bwrite(fd, (char *) &flags, sizeof(struct flag));
-       bwrite(fd, (char *) &dlevel, sizeof dlevel);
-       bwrite(fd, (char *) &maxdlevel, sizeof maxdlevel);
-       bwrite(fd, (char *) &moves, sizeof moves);
-       bwrite(fd, (char *) &u, sizeof(struct you));
+       bwrite(fd, &tmp, sizeof tmp);
+       bwrite(fd, &flags, sizeof(struct flag));
+       bwrite(fd, &dlevel, sizeof dlevel);
+       bwrite(fd, &maxdlevel, sizeof maxdlevel);
+       bwrite(fd, &moves, sizeof moves);
+       bwrite(fd, &u, sizeof(struct you));
        if (u.ustuck)
-               bwrite(fd, (char *) &(u.ustuck->m_id), sizeof u.ustuck->m_id);
-       bwrite(fd, (char *) pl_character, sizeof pl_character);
-       bwrite(fd, (char *) genocided, sizeof genocided);
-       bwrite(fd, (char *) fut_geno, sizeof fut_geno);
+               bwrite(fd, &(u.ustuck->m_id), sizeof u.ustuck->m_id);
+       bwrite(fd, pl_character, sizeof pl_character);
+       bwrite(fd, genocided, sizeof genocided);
+       bwrite(fd, fut_geno, sizeof fut_geno);
        savenames(fd);
        for (tmp = 1; tmp <= maxdlevel; tmp++) {
 
@@ -143,7 +144,7 @@ dosave0(int hu)
                }
                getlev(ofd, hackpid, tmp);
                (void) close(ofd);
-               bwrite(fd, (char *) &tmp, sizeof tmp);  /* level number */
+               bwrite(fd, &tmp, sizeof tmp);   /* level number */
                savelev(fd, tmp);       /* actual level */
                (void) unlink(lock);
        }
@@ -171,7 +172,7 @@ dorecover(int fd)
                        setworn(otmp, otmp->owornmask);
        fcobj = restobjchn(fd);
        fallen_down = restmonchn(fd);
-       mread(fd, (char *) &tmp, sizeof tmp);
+       mread(fd, &tmp, sizeof tmp);
        if (tmp != (int) getuid()) {    /* strange ... */
                (void) close(fd);
                (void) unlink(SAVEF);
@@ -179,19 +180,19 @@ dorecover(int fd)
                restoring = FALSE;
                return (0);
        }
-       mread(fd, (char *) &flags, sizeof(struct flag));
-       mread(fd, (char *) &dlevel, sizeof dlevel);
-       mread(fd, (char *) &maxdlevel, sizeof maxdlevel);
-       mread(fd, (char *) &moves, sizeof moves);
-       mread(fd, (char *) &u, sizeof(struct you));
+       mread(fd, &flags, sizeof(struct flag));
+       mread(fd, &dlevel, sizeof dlevel);
+       mread(fd, &maxdlevel, sizeof maxdlevel);
+       mread(fd, &moves, sizeof moves);
+       mread(fd, &u, sizeof(struct you));
        if (u.ustuck)
-               mread(fd, (char *) &mid, sizeof mid);
-       mread(fd, (char *) pl_character, sizeof pl_character);
-       mread(fd, (char *) genocided, sizeof genocided);
-       mread(fd, (char *) fut_geno, sizeof fut_geno);
+               mread(fd, &mid, sizeof mid);
+       mread(fd, pl_character, sizeof pl_character);
+       mread(fd, genocided, sizeof genocided);
+       mread(fd, fut_geno, sizeof fut_geno);
        restnames(fd);
        while (1) {
-               if (read(fd, (char *) &tmp, sizeof tmp) != sizeof tmp)
+               if (read(fd, &tmp, sizeof tmp) != sizeof tmp)
                        break;
                getlev(fd, 0, tmp);
                glo(tmp);
@@ -246,7 +247,7 @@ restobjchn(int fd)
        struct obj     *first = 0;
        int             xl;
        while (1) {
-               mread(fd, (char *) &xl, sizeof(xl));
+               mread(fd, &xl, sizeof(xl));
                if (xl == -1)
                        break;
                otmp = newobj(xl);
@@ -254,7 +255,7 @@ restobjchn(int fd)
                        first = otmp;
                else
                        otmp2->nobj = otmp;
-               mread(fd, (char *) otmp, (unsigned) xl + sizeof(struct obj));
+               mread(fd, otmp, (unsigned) xl + sizeof(struct obj));
                if (!otmp->o_id)
                        otmp->o_id = flags.ident++;
                otmp2 = otmp;
@@ -276,7 +277,7 @@ restmonchn(int fd)
        struct permonst *monbegin;
        long            differ;
 
-       mread(fd, (char *) &monbegin, sizeof(monbegin));
+       mread(fd, &monbegin, sizeof(monbegin));
        differ = (const char *) (&mons[0]) - (const char *) (monbegin);
 
 #ifdef lint
@@ -284,7 +285,7 @@ restmonchn(int fd)
        mtmp2 = 0;
 #endif /* lint */
        while (1) {
-               mread(fd, (char *) &xl, sizeof(xl));
+               mread(fd, &xl, sizeof(xl));
                if (xl == -1)
                        break;
                mtmp = newmonst(xl);
@@ -292,7 +293,7 @@ restmonchn(int fd)
                        first = mtmp;
                else
                        mtmp2->nmon = mtmp;
-               mread(fd, (char *) mtmp, (unsigned) xl + sizeof(struct monst));
+               mread(fd, mtmp, (unsigned) xl + sizeof(struct monst));
                if (!mtmp->m_id)
                        mtmp->m_id = flags.ident++;
                mtmp->data = (const struct permonst *)