We don't need a private #define "unsgn" for "unsigned", especially since

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

diff --git a/hack/hack.end.c b/hack/hack.end.c
index a3d4c508872e191e70b3ebb5f663c774b184d90f..3ea064b4cffddda883b98824bae706dcc7f55c34 100644 (file)
--- a/hack/hack.end.c
+++ b/hack/hack.end.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: hack.end.c,v 1.6 2003/04/02 18:36:36 jsm Exp $ */
+/*     $NetBSD: hack.end.c,v 1.10 2009/05/06 02:59:12 ginsbach Exp $   */

 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,


@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
 
 #include <sys/cdefs.h>
 #ifndef lint

-__RCSID("$NetBSD: hack.end.c,v 1.6 2003/04/02 18:36:36 jsm Exp $");
+__RCSID("$NetBSD: hack.end.c,v 1.10 2009/05/06 02:59:12 ginsbach Exp $");

 #endif                         /* not lint */
 
 #include <signal.h>
 #endif                         /* not lint */
 
 #include <signal.h>


@@ -86,7 +86,7 @@ dodone()
 /*ARGSUSED*/
 void
 done1(n)
 /*ARGSUSED*/
 void
 done1(n)

-       int n __attribute__((__unused__));
+       int n __unused;

 {
        (void) signal(SIGINT, SIG_IGN);
        pline("Really quit?");
 {
        (void) signal(SIGINT, SIG_IGN);
        pline("Really quit?");


@@ -108,7 +108,7 @@ int             done_hup;
 /*ARGSUSED*/
 void
 done_intr(n)
 /*ARGSUSED*/
 void
 done_intr(n)

-       int n __attribute__((__unused__));
+       int n __unused;

 {
        done_stopprint++;
        (void) signal(SIGINT, SIG_IGN);
 {
        done_stopprint++;
        (void) signal(SIGINT, SIG_IGN);


@@ -360,7 +360,7 @@ topten()
        (t0->name)[NAMSZ] = 0;
        (void) strncpy(t0->death, killer, DTHSZ);
        (t0->death)[DTHSZ] = 0;
        (t0->name)[NAMSZ] = 0;
        (void) strncpy(t0->death, killer, DTHSZ);
        (t0->death)[DTHSZ] = 0;

-       (void) strcpy(t0->date, getdate());
+       (void) strcpy(t0->date, getdatestr());

 
        /* assure minimum number of points */
        if (t0->points < POINTSMIN)
 
        /* assure minimum number of points */
        if (t0->points < POINTSMIN)


@@ -448,8 +448,8 @@ topten()
                                t1->plchar, t1->sex, t1->name, t1->death);
                if (done_stopprint)
                        continue;
                                t1->plchar, t1->sex, t1->name, t1->death);
                if (done_stopprint)
                        continue;

-               if (rank > flags.end_top &&
-                   (rank < rank0 - flags.end_around || rank > rank0 + flags.end_around)
+               if (rank > (int)flags.end_top &&
+                   (rank < rank0 - (int)flags.end_around || rank > rank0 + (int)flags.end_around)

                    && (!flags.end_own ||
 #ifdef PERS_IS_UID
                        t1->uid != t0->uid))
                    && (!flags.end_own ||
 #ifdef PERS_IS_UID
                        t1->uid != t0->uid))


@@ -457,8 +457,8 @@ topten()
                        strncmp(t1->name, t0->name, NAMSZ)))
 #endif /* PERS_IS_UID */
                        continue;
                        strncmp(t1->name, t0->name, NAMSZ)))
 #endif /* PERS_IS_UID */
                        continue;

-               if (rank == rank0 - flags.end_around &&
-                   rank0 > flags.end_top + flags.end_around + 1 &&
+               if (rank == rank0 - (int)flags.end_around &&
+                   rank0 > (int)flags.end_top + (int)flags.end_around + 1 &&

                    !flags.end_own)
                        (void) putchar('\n');
                if (rank != rank0)
                    !flags.end_own)
                        (void) putchar('\n');
                if (rank != rank0)


@@ -477,6 +477,7 @@ topten()
                if (!done_stopprint)
                        (void) outentry(0, t0, 1);
        (void) fclose(rfile);
                if (!done_stopprint)
                        (void) outentry(0, t0, 1);
        (void) fclose(rfile);

+       free(t0);

 unlock:
        (void) unlink(reclock);
 }
 unlock:
        (void) unlink(reclock);
 }


@@ -498,8 +499,9 @@ outheader()
 int
 outentry(int rank, struct toptenentry *t1, int so)
 {
 int
 outentry(int rank, struct toptenentry *t1, int so)
 {

-       boolean         quit = FALSE, killed = FALSE, starv = FALSE;
+       boolean         quit = FALSE, gotkilled = FALSE, starv = FALSE;

        char            linebuf[BUFSZ];
        char            linebuf[BUFSZ];

+

        linebuf[0] = 0;
        if (rank)
                Sprintf(eos(linebuf), "%3d", rank);
        linebuf[0] = 0;
        if (rank)
                Sprintf(eos(linebuf), "%3d", rank);


@@ -529,15 +531,15 @@ outentry(int rank, struct toptenentry *t1, int so)
                else if (!strncmp(t1->death, "starv", 5))
                        Sprintf(eos(linebuf), "starved to death"), starv = TRUE;
                else
                else if (!strncmp(t1->death, "starv", 5))
                        Sprintf(eos(linebuf), "starved to death"), starv = TRUE;
                else

-                       Sprintf(eos(linebuf), "was killed"), killed = TRUE;
+                       Sprintf(eos(linebuf), "was killed"), gotkilled = TRUE;

                Sprintf(eos(linebuf), " on%s level %d",
                Sprintf(eos(linebuf), " on%s level %d",

-                       (killed || starv) ? "" : " dungeon", t1->level);
+                       (gotkilled || starv) ? "" : " dungeon", t1->level);

                if (t1->maxlvl != t1->level)
                        Sprintf(eos(linebuf), " [max %d]", t1->maxlvl);
                if (quit && t1->death[4])
                        Sprintf(eos(linebuf), t1->death + 4);
        }
                if (t1->maxlvl != t1->level)
                        Sprintf(eos(linebuf), " [max %d]", t1->maxlvl);
                if (quit && t1->death[4])
                        Sprintf(eos(linebuf), t1->death + 4);
        }

-       if (killed)
+       if (gotkilled)

                Sprintf(eos(linebuf), " by %s%s",
                        (!strncmp(t1->death, "trick", 5) || !strncmp(t1->death, "the ", 4))
                        ? "" :
                Sprintf(eos(linebuf), " by %s%s",
                        (!strncmp(t1->death, "trick", 5) || !strncmp(t1->death, "the ", 4))
                        ? "" :


@@ -587,9 +589,10 @@ const char           *
 ordin(n)
        int             n;
 {
 ordin(n)
        int             n;
 {

-       int             d = n % 10;
-       return ((d == 0 || d > 3 || n / 10 == 1) ? "th" : (d == 1) ? "st" :
-               (d == 2) ? "nd" : "rd");
+       int             dg = n % 10;
+
+       return ((dg == 0 || dg > 3 || n / 10 == 1) ? "th" : (dg == 1) ? "st" :
+               (dg == 2) ? "nd" : "rd");

 }
 
 void
 }
 
 void