fix pedantic warnings

The code now compiles under gcc version 11.5.0 with
all warnings and pedantic warnings enabled.

Fixed a number of problems related arguments
of pointers to functions.

Attempt to address issue #2: Compile error under Debian.

Author: lcn2

Makefile

@@ -242,6 +242,8 @@ FSANITIZE+= -fsanitize=vptr
 # FSANITIZE+= -fsanitize=nullability-arg
 # FSANITIZE+= -fsanitize=nullability-assign
 # FSANITIZE+= -fsanitize=nullability-return
+# CCWARN+= -Wall
+# CCWARN+= -pedantic
 # CCWARN+= -Werror
 # CFLAGS+= ${FSANITIZE} -fstack-protector-all
 # LDFLAGS+= ${FSANITIZE}
@@ -274,6 +276,8 @@ FSANITIZE+= -fsanitize=vptr
 #
 #   dnf install readline-devel ncurses-libs ncurses-devel libasan libubsan
 #
+# CCWARN+= -Wall
+# CCWARN+= -pedantic
 # CCWARN+= -Werror
 # CFLAGS+= ${FSANITIZE} -fstack-protector-all
 # LDFLAGS+= ${FSANITIZE}

daemon.c

@@ -39,7 +39,7 @@ d_slot(void)
  *	Find a particular slot in the table
  */
 struct delayed_action *
-find_slot(void (*func)())
+find_slot(void (*func)(int))
 {
     struct delayed_action *dev;
 
@@ -54,7 +54,7 @@ find_slot(void (*func)())
  *	Start a daemon, takes a function.
  */
 void
-start_daemon(void (*func)(), int arg, int type)
+start_daemon(void (*func)(int), int arg, int type)
 {
     struct delayed_action *dev;
 
@@ -70,7 +70,7 @@ start_daemon(void (*func)(), int arg, int type)
  *	Remove a daemon from the list
  */
 void
-kill_daemon(void (*func)())
+kill_daemon(void (*func)(int))
 {
     struct delayed_action *dev;
 
@@ -108,7 +108,7 @@ do_daemons(int flag)
  *	Start a fuse to go off in a certain number of turns
  */
 void
-fuse(void (*func)(), int arg, int time, int type)
+fuse(void (*func)(int), int arg, int time, int type)
 {
     struct delayed_action *wire;
 
@@ -124,7 +124,7 @@ fuse(void (*func)(), int arg, int time, int type)
  *	Increase the time until a fuse goes off
  */
 void
-lengthen(void (*func)(), int xtime)
+lengthen(void (*func)(int), int xtime)
 {
     struct delayed_action *wire;
 
@@ -138,7 +138,7 @@ lengthen(void (*func)(), int xtime)
  *	Put out a fuse
  */
 void
-extinguish(void (*func)())
+extinguish(void (*func)(int))
 {
     struct delayed_action *wire;
 

daemons.c

@@ -239,7 +239,7 @@ come_down(void)
  *	change the characters for the player
  */
 void
-visuals(void)
+visuals(int d_arg __attribute__ ((__unused__)))
 {
     THING *tp;
     int seemonst;

new_level.c

@@ -100,7 +100,7 @@ new_level(void)
     if (on(player, SEEMONST))
 	turn_see(FALSE);
     if (on(player, ISHALU))
-	visuals();
+	visuals(0);
 }
 
 /*

potions.c

@@ -111,7 +111,7 @@ quaff(void)
 	    msg("you feel stronger, now.  What bulging muscles!");
 	when P_MFIND:
 	    player.t_flags |= SEEMONST;
-	    fuse((void(*)())turn_see, TRUE, HUHDURATION, AFTER);
+	    fuse((void(*)(int))turn_see, TRUE, HUHDURATION, AFTER);
 	    if (!turn_see(FALSE))
 		msg("you have a %s feeling for a moment, then it passes",
 		    choose_str("normal", "strange"));

rip.c

@@ -103,7 +103,6 @@ void
 score(int amount, int flags, int monst)
 {
     SCORE *scp;
-    int i;
     SCORE *sc2;
     SCORE *top_scores, *endp;
 # ifdef MASTER

rogue.h

@@ -616,7 +616,7 @@ int	endmsg(void);
 void	enter_room(const coord *cp);
 void	erase_lamp(const coord *pos, const struct room *rp);
 int	exp_add(const THING *tp);
-void	extinguish(void (*func)());
+void	extinguish(void (*func)(int));
 void	fall(THING *obj, int pr);
 int	fallpos(const coord *pos, coord *newpos);
 void	fatal(const char *s);
@@ -629,7 +629,7 @@ int	find_floor(const struct room *rp, coord *cp, int limit, int monst);
 THING   *find_obj(int y, int x);
 int	fight(const coord *mp, const THING *weap, int thrown);
 void	fix_stick(THING *cur);
-void	fuse(void (*func)(), int arg, int time, int type);
+void	fuse(void (*func)(int), int arg, int time, int type);
 int	get_bool(void *vp, WINDOW *win);
 int	get_dir(void);
 int	get_inv_t(void *vp, WINDOW *win);
@@ -644,7 +644,7 @@ void	help(void);
 void	hit(const char *er, const char *ee, int noend);
 void	horiz(const struct room *rp, int starty);
 void	leave_room(const coord *cp);
-void	lengthen(void (*func)(), int xtime);
+void	lengthen(void (*func)(int), int xtime);
 void	look(int wakeup);
 int	hit_monster(int y, int x, const THING *obj);
 void	identify(void);
@@ -663,7 +663,7 @@ void	invis_on(void);
 int	is_current(const THING *obj);
 int	is_magic(const THING *obj);
 int     is_symlink(const char *sp);
-void	kill_daemon(void (*func)());
+void	kill_daemon(void (*func)(int));
 void	killed(THING *tp, int pr);
 const char *killname(int monst, int doart);
 void	land(void);
@@ -757,7 +757,7 @@ void	show_win(const char *message);
 void	sight(int d_arg);
 int	sign(int nm);
 int	spread(int nm);
-void	start_daemon(void (*func)(), int arg, int type);
+void	start_daemon(void (*func)(int), int arg, int type);
 void	start_score(void);
 void	status(void);
 int	step_ok(int ch);
@@ -782,7 +782,7 @@ void	uncurse(THING *obj);
 void	unlock_sc(void);
 void	unsee(int d_arg);
 void	vert(const struct room *rp, int startx);
-void	visuals(void);
+void	visuals(int);
 char	*vowelstr(const char *str);
 void	wait_for(WINDOW *win, int ch);
 const THING *wake_monster(int y, int x);

save.c

@@ -164,12 +164,13 @@ restore(const char *file)
     struct stat sbuf2;
     int lines, cols;
 
-    if (strcmp(file, "-r") == 0)
+    if (strcmp(file, "-r") == 0) {
 	file = file_name;
+    }
 
-	md_tstphold();
+    md_tstphold();
 
-	if ((inf = fopen(file,"r")) == NULL)
+    if ((inf = fopen(file,"r")) == NULL)
     {
 	perror(file);
 	return FALSE;
@@ -375,7 +376,6 @@ rd_score(SCORE *top_score)
 {
     char scoreline[MAXSCORELINE+1]; /* +1 for paranoia */
     SCORE score;		    /* scanned score */
-    char *realname = NULL;	    /* uid converted into username */
     bool failed = false;	    /* true ==> score file scan failed */
     int ret;			    /* scanf return value */
     int i;

scedit.c

@@ -26,7 +26,7 @@
 
 # define	RN	(((seed = seed*11109+13849) >> 16) & 0xffff)
 
-# define	MAXSTR	80
+# define	MAXSTR	1024
 
 # include	"score.h"
 # include	"config.h"
@@ -77,8 +77,9 @@ extern char *	s_killname(int monst, int doart);
 int
 main(int ac, char *av[])
 {
-	FILE	*outf;
 	int	inf;
+	size_t  scorename_len = 0;
+	size_t  home_len = 0;
 
 	memset(top_scores, 0, sizeof(top_scores)); /* paranoia */
 	if (ac == 1) {
@@ -89,14 +90,16 @@ main(int ac, char *av[])
 
 	    strncpy(home, md_gethomedir(), MAXSTR);
 	    home[MAXSTR] = '\0'; /* paranoia */
-	    if (strlen(home) > MAXSTR - strlen(SCORENAME) - 1)
+	    scorename_len = strlen(SCORENAME);
+	    home_len = strlen(home);
+	    if (home_len > MAXSTR - scorename_len - 1)
 		home[0] = '\0';
-	    scorefile = calloc(MAXSTR+1, 1);
+	    scorefile = calloc(MAXSTR+scorename_len+1, 1);
 	    if (scorefile == NULL) {
 		perror("calloc for scorefile failed");
 		exit(1);
 	    }
-	    snprintf(scorefile, MAXSTR, "%s%s", home, SCORENAME);
+	    snprintf(scorefile, MAXSTR+scorename_len, "%s%s", home, SCORENAME);
 	} else {
 		scorefile = av[1];
 	}
@@ -126,9 +129,7 @@ main(int ac, char *av[])
 int
 do_comm(void)
 {
-	char		*sp;
 	SCORE		*scp;
-	struct passwd	*pp;
 	static FILE	*outf = NULL;
 	static int written = TRUE;
 
@@ -209,7 +210,6 @@ do_comm(void)
 void
 add_score(void)
 {
-	SCORE		*scp;
 	uid_t id = 0;
 	int		i;
 	SCORE	new;
@@ -327,7 +327,6 @@ void
 del_score(void)
 {
 	SCORE	*scp;
-	int	i;
 	int	num;
 
 	for (;;) {

state.c

@@ -67,9 +67,6 @@
 #define READSTAT (format_error || read_error )
 #define WRITESTAT (write_error)
 
-static int read_error   = FALSE;
-static int write_error  = FALSE;
-static int format_error = FALSE;
 static int endian = 0x01020304;
 #define  big_endian ( *((char *)&endian) == 0x01 )