From c890a08499abeee279272b761dc2e198d3631e3c Mon Sep 17 00:00:00 2001
From: David Griffith <dave@661.org>
Date: Fri, 10 Jun 2016 21:05:22 -0700
Subject: [PATCH] More compiler warning fixes using Martin Pool's UNUSED macro.

---
 src/common/frotz.h     | 1 +
 src/curses/ux_audio.c  | 8 +++-----
 src/curses/ux_init.c   | 7 ++-----
 src/curses/ux_input.c  | 4 +---
 src/curses/ux_screen.c | 4 +---
 src/curses/ux_text.c   | 4 +---
 src/dumb/dumb_init.c   | 1 -
 src/dumb/dumb_input.c  | 1 -
 src/dumb/dumb_output.c | 1 -
 9 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/common/frotz.h b/src/common/frotz.h
index de23895..72aba0f 100644
--- a/src/common/frotz.h
+++ b/src/common/frotz.h
@@ -90,6 +90,7 @@ typedef struct {
 
 
 #include "setup.h"
+#include "unused.h"
 
 /*** Constants that may be set at compile time ***/
 
diff --git a/src/curses/ux_audio.c b/src/curses/ux_audio.c
index a9a1ac1..3e2f7e9 100644
--- a/src/curses/ux_audio.c
+++ b/src/curses/ux_audio.c
@@ -75,7 +75,7 @@ static void stereoize(float *, float *, size_t);
 
 static int mypower(int, int);
 static char *getfiledata(FILE *, long *);
-static void *mixer(void *);
+static void *mixer(void);
 
 static pthread_t	mixer_id;
 static pthread_t	playaiff_id;
@@ -135,7 +135,7 @@ void os_init_sound(void)
     pthread_attr_init(&attr);
     pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
 
-    err = pthread_create(&(mixer_id), &attr, &mixer, NULL);
+    err = pthread_create(&(mixer_id), &attr, (void *) &mixer, NULL);
     if (err != 0) {
 	printf("Can't create mixer thread :[%s]", strerror(err));
 	exit(1);
@@ -312,7 +312,7 @@ void os_wait_sample (void)
  * Data presented to the mixer must be floats at 44100hz
  *
  */
-static void *mixer(void *arg)
+static void *mixer(void)
 {
     short *shortbuffer;
     int default_driver;
@@ -321,8 +321,6 @@ static void *mixer(void *arg)
     int samplecount;
     int i;
 
-    arg = arg;		/* Keep -Wall quiet */
-
     ao_initialize();
     default_driver = ao_default_driver_id();
 
diff --git a/src/curses/ux_init.c b/src/curses/ux_init.c
index 9d03cd4..4b28aad 100644
--- a/src/curses/ux_init.c
+++ b/src/curses/ux_init.c
@@ -503,9 +503,8 @@ void os_reset_screen (void)
  *     RESTART_END - restart is complete
  *
  */
-void os_restart_game (int stage)
+void os_restart_game (int UNUSED (stage))
 {
-    stage = stage;	/* Keep -Wall quiet */
 }
 
 
@@ -923,7 +922,7 @@ static int geterrmode(char *value)
  * cleanly resize the window.
  *
  */
-void sigwinch_handler(int sig)
+void sigwinch_handler(int UNUSED(sig))
 {
 /*
 There are some significant problems involved in getting resizes to work
@@ -932,8 +931,6 @@ the Z-Machine standard itself.  See the file BUGS for a detailed
 explaination for this.  Because of this trouble, this function currently
 does nothing.
 */
-    sig = sig;		/* Keep -Wall quiet */
-
 }
 
 
diff --git a/src/curses/ux_input.c b/src/curses/ux_input.c
index aaf3aef..97e0d01 100644
--- a/src/curses/ux_input.c
+++ b/src/curses/ux_input.c
@@ -613,13 +613,11 @@ zchar os_read_key (int timeout, int cursor)
  *
  */
 
-int os_read_file_name (char *file_name, const char *default_name, int flag)
+int os_read_file_name (char *file_name, const char *default_name, int UNUSED(flag))
 {
     int saved_replay = istream_replay;
     int saved_record = ostream_record;
 
-    flag = flag;	/*Keep -Wall quiet */
-
     /* Turn off playback and recording temporarily */
 
     istream_replay = 0;
diff --git a/src/curses/ux_screen.c b/src/curses/ux_screen.c
index dfa4312..4a8ef7f 100644
--- a/src/curses/ux_screen.c
+++ b/src/curses/ux_screen.c
@@ -44,12 +44,10 @@
  * being erased.  This is not relevant for the curses interface.
  *
  */
-void os_erase_area (int top, int left, int bottom, int right, int win)
+void os_erase_area (int top, int left, int bottom, int right, int UNUSED(win))
 {
     int y, x, i, j;
 
-    win = win;		/* Keep -Wall quiet */
-
     /* Catch the most common situation and do things the easy way */
     if ((top == 1) && (bottom == h_screen_rows) &&
 	(left == 1) && (right == h_screen_cols)) {
diff --git a/src/curses/ux_text.c b/src/curses/ux_text.c
index 57d3b75..0384bbb 100644
--- a/src/curses/ux_text.c
+++ b/src/curses/ux_text.c
@@ -185,11 +185,9 @@ void os_set_text_style (int new_style)
  * choose fonts which aren't supported by the interface.
  *
  */
-void os_set_font (int new_font)
+void os_set_font (int UNUSED(new_font))
 {
     /* Not implemented */
-    new_font = new_font;	/* Keep -Wall quiet */
-
 }/* os_set_font */
 
 
diff --git a/src/dumb/dumb_init.c b/src/dumb/dumb_init.c
index 961613a..a4617b5 100644
--- a/src/dumb/dumb_init.c
+++ b/src/dumb/dumb_init.c
@@ -6,7 +6,6 @@
  */
 
 #include "dumb_frotz.h"
-#include "../common/unused.h"
 
 f_setup_t f_setup;
 
diff --git a/src/dumb/dumb_input.c b/src/dumb/dumb_input.c
index 701ec71..bc64125 100644
--- a/src/dumb/dumb_input.c
+++ b/src/dumb/dumb_input.c
@@ -5,7 +5,6 @@
  */
 
 #include "dumb_frotz.h"
-#include "../common/unused.h"
 
 f_setup_t f_setup;
 
diff --git a/src/dumb/dumb_output.c b/src/dumb/dumb_output.c
index 31ec727..1e2bd39 100644
--- a/src/dumb/dumb_output.c
+++ b/src/dumb/dumb_output.c
@@ -6,7 +6,6 @@
  */
 
 #include "dumb_frotz.h"
-#include "../common/unused.h"
 
 f_setup_t f_setup;
 
-- 
2.34.1