remove redundant decls.

[bsdgames-darwin.git] / sail / pl_1.c

diff --git a/sail/pl_1.c b/sail/pl_1.c
index 979d0c56f44b9c784ac7903149525e09bbca2863..3397ddfced76cf4e2cf0586809c6f2297795cd12 100644 (file)
--- a/sail/pl_1.c
+++ b/sail/pl_1.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: pl_1.c,v 1.6 1999/02/10 00:45:46 hubertf Exp $ */
+/*     $NetBSD: pl_1.c,v 1.16 2001/02/05 01:10:10 christos Exp $       */
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,14 +38,18 @@
 #if 0
 static char sccsid[] = "@(#)pl_1.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: pl_1.c,v 1.6 1999/02/10 00:45:46 hubertf Exp $");
+__RCSID("$NetBSD: pl_1.c,v 1.16 2001/02/05 01:10:10 christos Exp $");
 #endif
 #endif /* not lint */
 
-#include "player.h"
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
+#include "extern.h"
+#include "player.h"
 
 /*
  * If we get here before a ship is chosen, then ms == 0 and
@@ -56,14 +60,13 @@ __RCSID("$NetBSD: pl_1.c,v 1.6 1999/02/10 00:45:46 hubertf Exp $");
  * because of a Sync() failure.
  */
 void
-leave(conditions)
-int conditions;
+leave(int conditions)
 {
-       (void) signal(SIGHUP, SIG_IGN);
-       (void) signal(SIGINT, SIG_IGN);
-       (void) signal(SIGQUIT, SIG_IGN);
-       (void) signal(SIGALRM, SIG_IGN);
-       (void) signal(SIGCHLD, SIG_IGN);
+       signal(SIGHUP, SIG_IGN);
+       signal(SIGINT, SIG_IGN);
+       signal(SIGQUIT, SIG_IGN);
+       signal(SIGALRM, SIG_IGN);
+       signal(SIGCHLD, SIG_IGN);
 
        if (done_curses) {
                Msg("It looks like you've had it!");
@@ -110,7 +113,7 @@ int conditions;
                        makemsg(ms, "Captain %s relinquishing.",
                                mf->captain);
                        Write(W_END, ms, 0, 0, 0, 0);
-                       (void) Sync();
+                       Sync();
                }
        }
        sync_close(!hasdriver);
@@ -121,25 +124,23 @@ int conditions;
 
 /*ARGSUSED*/
 void
-choke(n)
-       int n;
+choke(int n __attribute__((__unused__)))
 {
        leave(LEAVE_QUIT);
 }
 
 /*ARGSUSED*/
 void
-child(n)
-       int n;
+child(int n __attribute__((__unused__)))
 {
        union wait status;
        int pid;
 
-       (void) signal(SIGCHLD, SIG_IGN);
+       signal(SIGCHLD, SIG_IGN);
        do {
                pid = wait3((int *)&status, WNOHANG, (struct rusage *)0);
                if (pid < 0 || (pid > 0 && !WIFSTOPPED(status)))
                        hasdriver = 0;
        } while (pid > 0);
-       (void) signal(SIGCHLD, child);
+       signal(SIGCHLD, child);
 }