From: Sascha Wildner <saw@online.de>
Date: Sun, 10 May 2015 03:29:17 +0000 (+0200)
Subject: sail(6): Clean up some signal handlers.
X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/commitdiff_plain/3d8e6759bec92edc4aec22c5d43f24fd77a58fef

sail(6): Clean up some signal handlers.
---

diff --git a/games/sail/externs.h b/games/sail/externs.h
index f2468e6f22..36dbed63a6 100644
--- a/games/sail/externs.h
+++ b/games/sail/externs.h
@@ -354,8 +354,8 @@ void unboard(struct ship *, struct ship *, char);
 
 /* pl_1.c */
 void leave(int);
-void choke(void);
-void child(void);
+void choke(int);
+void child(int);
 
 /* pl_2.c */
 void play(void);
diff --git a/games/sail/pl_1.c b/games/sail/pl_1.c
index e78d1ee1ad..193fdebfac 100644
--- a/games/sail/pl_1.c
+++ b/games/sail/pl_1.c
@@ -109,13 +109,13 @@ leave(int conditions)
 }
 
 void
-choke(void)
+choke(__unused int sig)
 {
 	leave(LEAVE_QUIT);
 }
 
 void
-child(void)
+child(__unused int sig)
 {
 	pid_t pid;
 	int status;
@@ -126,5 +126,5 @@ child(void)
 		if (pid < 0 || (pid > 0 && !WIFSTOPPED(status)))
 			hasdriver = 0;
 	} while (pid > 0);
-	signal(SIGCHLD, (sig_t)child);
+	signal(SIGCHLD, child);
 }
diff --git a/games/sail/pl_main.c b/games/sail/pl_main.c
index b770cd4d5a..55486b028d 100644
--- a/games/sail/pl_main.c
+++ b/games/sail/pl_main.c
@@ -28,7 +28,6 @@
  *
  * @(#)pl_main.c	8.1 (Berkeley) 5/31/93
  * $FreeBSD: src/games/sail/pl_main.c,v 1.6 1999/11/30 03:49:38 billf Exp $
- * $DragonFly: src/games/sail/pl_main.c,v 1.4 2006/09/03 17:33:13 pavalos Exp $
  */
 
 #include <sys/types.h>
@@ -104,8 +103,8 @@ reprint:
 	windspeed = cc->windspeed;
 	winddir = cc->winddir;
 
-	signal(SIGHUP, (sig_t)choke);
-	signal(SIGINT, (sig_t)choke);
+	signal(SIGHUP, choke);
+	signal(SIGINT, choke);
 
 	hasdriver = sync_exists(game);
 	if (sync_open() < 0) {
@@ -174,7 +173,7 @@ reprint:
 	if (Sync() < 0)
 		leave(LEAVE_SYNC);
 
-	signal(SIGCHLD, (sig_t)child);
+	signal(SIGCHLD, child);
 	if (!hasdriver)
 		switch (fork()) {
 		case 0: