A revision of "The purpose of computing is insight, not numbers" by

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

diff --git a/rogue/score.c b/rogue/score.c
index bb6b5461b80000e157603f826825712108e72ae8..4bcf4e3691cdffe43d878a39d40cf2b8ed288631 100644 (file)
--- a/rogue/score.c
+++ b/rogue/score.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: score.c,v 1.12 2007/12/27 23:53:01 dholland Exp $      */
+/*     $NetBSD: score.c,v 1.16 2011/08/26 06:18:17 dholland Exp $      */
 
 /*
  * Copyright (c) 1988, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)score.c    8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: score.c,v 1.12 2007/12/27 23:53:01 dholland Exp $");
+__RCSID("$NetBSD: score.c,v 1.16 2011/08/26 06:18:17 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -57,10 +57,14 @@ __RCSID("$NetBSD: score.c,v 1.12 2007/12/27 23:53:01 dholland Exp $");
 #include "rogue.h"
 #include "pathnames.h"
 
+static void center(short, const char *);
+static int get_value(const object *);
+static void id_all(void);
+static void sell_pack(void);
+static void sf_error(void) __dead;
+
 void
-killed_by(monster, other)
-       const object *monster;
-       short other;
+killed_by(const object *monster, short other)
 {
        const char *mechanism = "killed by something unknown (?)";
        char mechanism_buf[128];
@@ -133,7 +137,7 @@ killed_by(monster, other)
 }
 
 void
-win()
+win(void)
 {
        unwield(rogue.weapon);          /* disarm and relax */
        unwear(rogue.armor);
@@ -153,12 +157,11 @@ win()
        messagef(0, "%s", "");          /* gcc objects to just "" */
        id_all();
        sell_pack();
-       put_scores((object *) 0, WIN);
+       put_scores(NULL, WIN);
 }
 
 void
-quit(from_intrpt)
-       boolean from_intrpt;
+quit(boolean from_intrpt)
 {
        char buf[DCOLS];
        short i, orow, ocol;
@@ -197,7 +200,7 @@ quit(from_intrpt)
                clean_up(byebye_string);
        }
        check_message();
-       killed_by((object *) 0, QUIT);
+       killed_by(NULL, QUIT);
 }
 
 /*
@@ -225,18 +228,11 @@ struct score_entry {
 
 #define NUM_SCORE_ENTRIES 10
 
-static void pad_spaces __P((char *, size_t));
-static void unpad_spaces(char *);
-static int read_score_entry __P((struct score_entry *, FILE *));
-static void write_score_entry __P((const struct score_entry *, int, FILE *));
-static void make_score __P((struct score_entry *, const object *, int));
-
+static void make_score(struct score_entry *, const object *, int);
 
 static
 void
-pad_spaces(str, len)
-       char *str;
-       size_t len;
+pad_spaces(char *str, size_t len)
 {
        size_t x;
        for (x=strlen(str); x<len-1; x++) {
@@ -247,8 +243,7 @@ pad_spaces(str, len)
 
 static
 void
-unpad_spaces(str)
-       char *str;
+unpad_spaces(char *str)
 {
        size_t x;
        for (x=strlen(str); x>0 && str[x-1]==' '; x--);
@@ -257,9 +252,7 @@ unpad_spaces(str)
 
 static
 int
-read_score_entry(se, fp)
-       struct score_entry *se;
-       FILE *fp;
+read_score_entry(struct score_entry *se, FILE *fp)
 {
        char score_block[80];
        char nickname_block[30];
@@ -314,10 +307,7 @@ read_score_entry(se, fp)
 
 static
 void
-write_score_entry(se, rank, fp)
-       const struct score_entry *se;
-       int rank;
-       FILE *fp;
+write_score_entry(const struct score_entry *se, int rank, FILE *fp)
 {
        char score_block[80];
        char nickname_block[30];
@@ -343,9 +333,7 @@ write_score_entry(se, rank, fp)
 }
 
 void
-put_scores(monster, other)
-       const object *monster;
-       short other;
+put_scores(const object *monster, short other)
 {
        short i, rank=-1, found_player = -1, numscores = 0;
        struct score_entry scores[NUM_SCORE_ENTRIES];
@@ -364,7 +352,7 @@ put_scores(monster, other)
        }
        setegid(gid);
        rewind(fp);
-       (void) xxx(1);
+       (void)xxx(1);
 
        for (numscores = 0; numscores < NUM_SCORE_ENTRIES; numscores++) {
                if (read_score_entry(&scores[numscores], fp) == 0) {
@@ -424,7 +412,7 @@ put_scores(monster, other)
 
                md_ignore_signals();
                rewind(fp);
-               (void) xxx(1);
+               (void)xxx(1);
 
                for (i = 0; i < numscores; i++) {
                        write_score_entry(&scores[i], i, fp);
@@ -467,10 +455,7 @@ put_scores(monster, other)
 
 static
 void
-make_score(se, monster, other)
-       struct score_entry *se;
-       const object *monster;
-       int other;
+make_score(struct score_entry *se, const object *monster, int other)
 {
        const char *death = "bolts from the blue (?)";
        const char *hasamulet;
@@ -509,7 +494,7 @@ make_score(se, monster, other)
                } else {
                        article = "a";
                }
-               
+
                snprintf(deathbuf, sizeof(deathbuf),
                         "killed by %s %s", article, mn);
                death = deathbuf;
@@ -528,8 +513,7 @@ make_score(se, monster, other)
 }
 
 boolean
-is_vowel(ch)
-       short ch;
+is_vowel(short ch)
 {
        return( (ch == 'a') ||
                (ch == 'e') ||
@@ -538,8 +522,8 @@ is_vowel(ch)
                (ch == 'u') );
 }
 
-void
-sell_pack()
+static void
+sell_pack(void)
 {
        object *obj;
        short row = 2, val;
@@ -570,9 +554,8 @@ sell_pack()
        messagef(0, "%s", "");          /* gcc objects to just "" */
 }
 
-int
-get_value(obj)
-       const object *obj;
+static int
+get_value(const object *obj)
 {
        short wc;
        int val;
@@ -619,8 +602,8 @@ get_value(obj)
        return(val);
 }
 
-void
-id_all()
+static void
+id_all(void)
 {
        short i;
 
@@ -642,9 +625,7 @@ id_all()
 }
 
 void
-xxxx(buf, n)
-       char *buf;
-       short n;
+xxxx(char *buf, short n)
 {
        short i;
        unsigned char c;
@@ -652,15 +633,14 @@ xxxx(buf, n)
        for (i = 0; i < n; i++) {
 
                /* It does not matter if accuracy is lost during this assignment */
-               c = (unsigned char) xxx(0);
+               c = (unsigned char)xxx(0);
 
                buf[i] ^= c;
        }
 }
 
 long
-xxx(st)
-       boolean st;
+xxx(boolean st)
 {
        static long f, s;
        long r;
@@ -676,10 +656,8 @@ xxx(st)
        return(r);
 }
 
-void
-center(row, buf)
-       short row;
-       const char *buf;
+static void
+center(short row, const char *buf)
 {
        short margin;
 
@@ -687,8 +665,8 @@ center(row, buf)
        mvaddstr(row, margin, buf);
 }
 
-void
-sf_error()
+static void
+sf_error(void)
 {
        md_lock(0);
        messagef(1, "%s", "");          /* gcc objects to just "" */