From a383f4511734b978020b1f8b4360ef9ad438e929 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 26 Aug 2008 08:27:02 +0200
Subject: enable -Wpointer-arith, -Wstrict-prototypes

Also enable -Wunused-parameter - this forces us to add the gcc
"unused" attribute to a lot of parameters (mostly library callback
functions), but it's worth it during code refactorizations.
---
 src/inputPlugins/_flac_common.c     |  2 +-
 src/inputPlugins/flac_plugin.c      | 14 +++++++-------
 src/inputPlugins/oggvorbis_plugin.c |  2 +-
 src/inputPlugins/wavpack_plugin.c   |  3 ++-
 4 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'src/inputPlugins')

diff --git a/src/inputPlugins/_flac_common.c b/src/inputPlugins/_flac_common.c
index cf23a5e8c..92c3fe716 100644
--- a/src/inputPlugins/_flac_common.c
+++ b/src/inputPlugins/_flac_common.c
@@ -181,7 +181,7 @@ void flac_metadata_common_cb(const FLAC__StreamMetadata * block,
 
 void flac_error_common_cb(const char *plugin,
 			  const FLAC__StreamDecoderErrorStatus status,
-			  FlacData * data)
+			  mpd_unused FlacData * data)
 {
 	if (dc.stop)
 		return;
diff --git a/src/inputPlugins/flac_plugin.c b/src/inputPlugins/flac_plugin.c
index 38131bac9..a957e5107 100644
--- a/src/inputPlugins/flac_plugin.c
+++ b/src/inputPlugins/flac_plugin.c
@@ -31,7 +31,7 @@
 
 /* this code was based on flac123, from flac-tools */
 
-static flac_read_status flacRead(const flac_decoder * flacDec,
+static flac_read_status flacRead(mpd_unused const flac_decoder * flacDec,
                                   FLAC__byte buf[],
 				  flac_read_status_size_t *bytes,
 				  void *fdata)
@@ -57,7 +57,7 @@ static flac_read_status flacRead(const flac_decoder * flacDec,
 	return flac_read_status_continue;
 }
 
-static flac_seek_status flacSeek(const flac_decoder * flacDec,
+static flac_seek_status flacSeek(mpd_unused const flac_decoder * flacDec,
 				 FLAC__uint64 offset,
 				 void *fdata)
 {
@@ -70,7 +70,7 @@ static flac_seek_status flacSeek(const flac_decoder * flacDec,
 	return flac_seek_status_ok;
 }
 
-static flac_tell_status flacTell(const flac_decoder * flacDec,
+static flac_tell_status flacTell(mpd_unused const flac_decoder * flacDec,
 				 FLAC__uint64 * offset,
 				 void *fdata)
 {
@@ -81,7 +81,7 @@ static flac_tell_status flacTell(const flac_decoder * flacDec,
 	return flac_tell_status_ok;
 }
 
-static flac_length_status flacLength(const flac_decoder * flacDec,
+static flac_length_status flacLength(mpd_unused const flac_decoder * flacDec,
 				     FLAC__uint64 * length,
 				     void *fdata)
 {
@@ -92,7 +92,7 @@ static flac_length_status flacLength(const flac_decoder * flacDec,
 	return flac_length_status_ok;
 }
 
-static FLAC__bool flacEOF(const flac_decoder * flacDec, void *fdata)
+static FLAC__bool flacEOF(mpd_unused const flac_decoder * flacDec, void *fdata)
 {
 	FlacData *data = (FlacData *) fdata;
 
@@ -101,7 +101,7 @@ static FLAC__bool flacEOF(const flac_decoder * flacDec, void *fdata)
 	return false;
 }
 
-static void flacError(const flac_decoder *dec,
+static void flacError(mpd_unused const flac_decoder *dec,
 		      FLAC__StreamDecoderErrorStatus status, void *fdata)
 {
 	flac_error_common_cb("flac", status, (FlacData *) fdata);
@@ -199,7 +199,7 @@ static void flacPrintErroredState(FLAC__StreamDecoderState state)
 }
 #endif /* FLAC_API_VERSION_CURRENT >= 7 */
 
-static void flacMetadata(const flac_decoder * dec,
+static void flacMetadata(mpd_unused const flac_decoder * dec,
 			 const FLAC__StreamMetadata * block, void *vdata)
 {
 	flac_metadata_common_cb(block, (FlacData *) vdata);
diff --git a/src/inputPlugins/oggvorbis_plugin.c b/src/inputPlugins/oggvorbis_plugin.c
index 16040b388..359198b17 100644
--- a/src/inputPlugins/oggvorbis_plugin.c
+++ b/src/inputPlugins/oggvorbis_plugin.c
@@ -86,7 +86,7 @@ static int ogg_seek_cb(void *vdata, ogg_int64_t offset, int whence)
 }
 
 /* TODO: check Ogg libraries API and see if we can just not have this func */
-static int ogg_close_cb(void *vdata)
+static int ogg_close_cb(mpd_unused void *vdata)
 {
 	return 0;
 }
diff --git a/src/inputPlugins/wavpack_plugin.c b/src/inputPlugins/wavpack_plugin.c
index 7a7145141..ef7c59b8e 100644
--- a/src/inputPlugins/wavpack_plugin.c
+++ b/src/inputPlugins/wavpack_plugin.c
@@ -114,7 +114,8 @@ static void format_samples_int(int Bps, void *buffer, uint32_t samcnt)
 /*
  * This function converts floating point sample data to 16 bit integer.
  */
-static void format_samples_float(int Bps, void *buffer, uint32_t samcnt)
+static void format_samples_float(mpd_unused int Bps, void *buffer,
+				 uint32_t samcnt)
 {
 	int16_t *dst = (int16_t *)buffer;
 	float *src = (float *)buffer;
-- 
cgit v1.2.3