mark non-returning functions (PR#6144 by Joseph Myers <jsm28@cam.ac.uk>)

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

diff --git a/rogue/save.c b/rogue/save.c
index 135e0db09984875327288d7693de285cbe1f8589..910f3cdf574bc4473e5a1a4166ee4f8c8aed5fd7 100644 (file)
--- a/rogue/save.c
+++ b/rogue/save.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: save.c,v 1.3 1995/04/22 10:28:21 cgd Exp $     */
+/*     $NetBSD: save.c,v 1.4 1997/10/12 11:45:58 lukem Exp $   */
 
 /*
  * Copyright (c) 1988, 1993
@@ -36,11 +36,12 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)save.c     8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: save.c,v 1.3 1995/04/22 10:28:21 cgd Exp $";
+__RCSID("$NetBSD: save.c,v 1.4 1997/10/12 11:45:58 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -62,29 +63,7 @@ static char rcsid[] = "$NetBSD: save.c,v 1.3 1995/04/22 10:28:21 cgd Exp $";
 short write_failed = 0;
 char *save_file = (char *) 0;
 
-extern boolean detect_monster;
-extern short cur_level, max_level;
-extern char hunger_str[];
-extern char login_name[];
-extern short party_room;
-extern short foods;
-extern boolean is_wood[];
-extern short cur_room;
-extern boolean being_held;
-extern short bear_trap;
-extern short halluc;
-extern short blind;
-extern short confused;
-extern short levitate;
-extern short haste_self;
-extern boolean see_invisible;
-extern boolean detect_monster;
-extern boolean wizard;
-extern boolean score_only;
-extern short m_moves;
-
-extern boolean msg_cleared;
-
+void
 save_game()
 {
        char fname[64];
@@ -98,8 +77,9 @@ save_game()
        save_into_file(fname);
 }
 
+void
 save_into_file(sfile)
-char *sfile;
+       char *sfile;
 {
        FILE *fp;
        int file_id;
@@ -108,7 +88,7 @@ char *sfile;
        struct rogue_time rt_buf;
 
        if (sfile[0] == '~') {
-               if (hptr = md_getenv("HOME")) {
+               if ((hptr = md_getenv("HOME")) != NULL) {
                        (void) strcpy(name_buffer, hptr);
                        (void) strcat(name_buffer, sfile+1);
                        sfile = name_buffer;
@@ -167,8 +147,9 @@ char *sfile;
        }
 }
 
+void
 restore(fname)
-char *fname;
+       char *fname;
 {
        FILE *fp;
        struct rogue_time saved_time, mod_time;
@@ -176,6 +157,7 @@ char *fname;
        char tbuf[40];
        int new_file_id, saved_file_id;
 
+       fp = NULL;
        if (    ((new_file_id = md_get_file_id(fname)) == -1) ||
                        ((fp = fopen(fname, "r")) == NULL)) {
                clean_up("cannot open file");
@@ -247,23 +229,25 @@ char *fname;
        fclose(fp);
 }
 
+void
 write_pack(pack, fp)
-object *pack;
-FILE *fp;
+       object *pack;
+       FILE *fp;
 {
        object t;
 
-       while (pack = pack->next_object) {
+       while ((pack = pack->next_object) != NULL) {
                r_write(fp, (char *) pack, sizeof(object));
        }
        t.ichar = t.what_is = 0;
        r_write(fp, (char *) &t, sizeof(object));
 }
 
+void
 read_pack(pack, fp, is_rogue)
-object *pack;
-FILE *fp;
-boolean is_rogue;
+       object *pack;
+       FILE *fp;
+       boolean is_rogue;
 {
        object read_obj, *new_obj;
 
@@ -290,9 +274,10 @@ boolean is_rogue;
        }
 }
 
+void
 rw_dungeon(fp, rw)
-FILE *fp;
-boolean rw;
+       FILE *fp;
+       boolean rw;
 {
        short i, j;
        char buf[DCOLS];
@@ -314,11 +299,12 @@ boolean rw;
        }
 }
 
+void
 rw_id(id_table, fp, n, wr)
-struct id id_table[];
-FILE *fp;
-int n;
-boolean wr;
+       struct id id_table[];
+       FILE *fp;
+       int n;
+       boolean wr;
 {
        short i;
 
@@ -337,9 +323,10 @@ boolean wr;
        }
 }
 
+void
 write_string(s, fp)
-char *s;
-FILE *fp;
+       char *s;
+       FILE *fp;
 {
        short n;
 
@@ -349,9 +336,10 @@ FILE *fp;
        r_write(fp, s, n);
 }
 
+void
 read_string(s, fp)
-char *s;
-FILE *fp;
+       char *s;
+       FILE *fp;
 {
        short n;
 
@@ -360,9 +348,10 @@ FILE *fp;
        xxxx(s, n);
 }
 
+void
 rw_rooms(fp, rw)
-FILE *fp;
-boolean rw;
+       FILE *fp;
+       boolean rw;
 {
        short i;
 
@@ -372,20 +361,22 @@ boolean rw;
        }
 }
 
+void
 r_read(fp, buf, n)
-FILE *fp;
-char *buf;
-int n;
+       FILE *fp;
+       char *buf;
+       int n;
 {
        if (fread(buf, sizeof(char), n, fp) != n) {
                clean_up("read() failed, don't know why");
        }
 }
 
+void
 r_write(fp, buf, n)
-FILE *fp;
-char *buf;
-int n;
+       FILE *fp;
+       char *buf;
+       int n;
 {
        if (!write_failed) {
                if (fwrite(buf, sizeof(char), n, fp) != n) {
@@ -398,7 +389,7 @@ int n;
 
 boolean
 has_been_touched(saved_time, mod_time)
-struct rogue_time *saved_time, *mod_time;
+       struct rogue_time *saved_time, *mod_time;
 {
        if (saved_time->year < mod_time->year) {
                return(1);