Make signal handlers void handler(int sig).

Author: tommay

hack.cmd.c

@@ -4,6 +4,7 @@
 #include	"hack.h"
 #include	"def.func_tab.h"
 
+/* done1() is now a void function but declaring it int here is ok. */
 int doredraw(),doredotopl(),dodrop(),dodrink(),doread(),dosearch(),dopickup(),
 doversion(),doweararm(),dowearring(),doremarm(),doremring(),dopay(),doapply(),
 dosave(),dowield(),ddoinv(),dozap(),ddocall(),dowhatis(),doengrave(),dotele(),

hack.end.c

@@ -11,7 +11,8 @@ extern const char *ordin();
 
 xchar maxdlevel = 1;
 
-done1()
+void
+done1(int sig)
 {
 	(void) signal(SIGINT,SIG_IGN);
 	pline("Really quit?");
@@ -20,7 +21,7 @@ done1()
 		clrlin();
 		(void) fflush(stdout);
 		if(multi > 0) nomul(0);
-		return(0);
+		return;
 	}
 	done("quit");
 	/* NOTREACHED */
@@ -29,16 +30,18 @@ done1()
 int done_stopprint;
 int done_hup;
 
-done_intr(){
+void
+done_intr(int sig){
 	done_stopprint++;
 	(void) signal(SIGINT, SIG_IGN);
 	(void) signal(SIGQUIT, SIG_IGN);
 }
 
-done_hangup(){
+void
+done_hangup(int sig){
 	done_hup++;
 	(void) signal(SIGHUP, SIG_IGN);
-	done_intr();
+	done_intr(0);
 }
 
 done_in_by(mtmp) register struct monst *mtmp; {
@@ -472,7 +475,8 @@ register x;
 }
 
 #ifdef NOSAVEONHANGUP
-hangup()
+void
+hangup(int sig)
 {
 	(void) signal(SIGINT, SIG_IGN);
 	clearlocks();

hack.main.c

@@ -18,8 +18,8 @@ int (*afternmv)();
 int (*occupation)();
 char const *occtxt;			/* defined when occupation != NULL */
 
-int done1();
-int hangup();
+void done1(int sig);
+void hangup(int sig);
 
 int hackpid;				/* current pid */
 int locknum;				/* max num of players */

hack.pager.c

@@ -13,7 +13,7 @@ extern int CO, LI;	/* usually COLNO and ROWNO+2 */
 extern char *CD;
 extern char quitchars[];
 extern char *getenv(), *getlogin();
-int done1();
+void done1(int sig);
 
 dowhatis()
 {
@@ -59,7 +59,8 @@ dowhatis()
 /* make the paging of a file interruptible */
 static int got_intrup;
 
-intruph(){
+void
+intruph(int sig){
 	got_intrup++;
 }
 
@@ -69,7 +70,7 @@ FILE *fp;
 int strip;	/* nr of chars to be stripped from each line (0 or 1) */
 {
 	register char *bufr, *ep;
-	int (*prevsig)() = signal(SIGINT, intruph);
+	void (*prevsig)(int) = signal(SIGINT, intruph);
 
 	set_pager(0);
 	bufr = (char *) alloc((unsigned) CO);

hack.save.c

@@ -23,7 +23,8 @@ dosave(){
 }
 
 #ifndef NOSAVEONHANGUP
-hangup(){
+void
+hangup(int sig){
 	(void) dosave0(1);
 	exit(1);
 }