From d5187ce694cca1c5bd05bd562d9494e7387a86d0 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 7 Sep 2008 19:14:39 +0200
Subject: fix -Wcast-qual -Wwrite-strings warnings

The previous patch enabled these warnings.  In Eric's branch, they
were worked around with a generic deconst_ptr() function.  There are
several places where we can add "const" to pointers, and in others,
libraries want non-const strings.  In the latter, convert string
literals to "static char[]" variables - this takes the same space, and
seems safer than deconsting a string literal.
---
 src/inputPlugins/mod_plugin.c     | 17 +++++++++++++----
 src/inputPlugins/wavpack_plugin.c | 12 ++++++++----
 2 files changed, 21 insertions(+), 8 deletions(-)

(limited to 'src/inputPlugins')

diff --git a/src/inputPlugins/mod_plugin.c b/src/inputPlugins/mod_plugin.c
index 586d87ae9..6b09e3cf0 100644
--- a/src/inputPlugins/mod_plugin.c
+++ b/src/inputPlugins/mod_plugin.c
@@ -48,14 +48,21 @@ static BOOL mod_mpd_IsThere(void)
 	return 1;
 }
 
+static char drv_name[] = "MPD";
+static char drv_version[] = "MPD Output Driver v0.1";
+
+#if (LIBMIKMOD_VERSION > 0x030106)
+static char drv_alias[] = "mpd";
+#endif
+
 static MDRIVER drv_mpd = {
 	NULL,
-	"MPD",
-	"MPD Output Driver v0.1",
+	drv_name,
+	drv_version,
 	0,
 	255,
 #if (LIBMIKMOD_VERSION > 0x030106)
-	"mpd", /* Alias */
+	drv_alias,
 #if (LIBMIKMOD_VERSION >= 0x030200)
 	NULL,  /* CmdLineHelp */
 #endif
@@ -92,6 +99,8 @@ static int mod_mikModInitError;
 
 static int mod_initMikMod(void)
 {
+	static char params[] = "";
+
 	if (mod_mikModInitError)
 		return -1;
 
@@ -110,7 +119,7 @@ static int mod_initMikMod(void)
 	md_mode = (DMODE_SOFT_MUSIC | DMODE_INTERP | DMODE_STEREO |
 		   DMODE_16BITS);
 
-	if (MikMod_Init("")) {
+	if (MikMod_Init(params)) {
 		ERROR("Could not init MikMod: %s\n",
 		      MikMod_strerror(MikMod_errno));
 		mod_mikModInitError = 1;
diff --git a/src/inputPlugins/wavpack_plugin.c b/src/inputPlugins/wavpack_plugin.c
index 77339dabd..8bba8ae2b 100644
--- a/src/inputPlugins/wavpack_plugin.c
+++ b/src/inputPlugins/wavpack_plugin.c
@@ -224,34 +224,38 @@ static char *wavpack_tag(WavpackContext *wpc, char *key)
 
 static ReplayGainInfo *wavpack_replaygain(WavpackContext *wpc)
 {
+	static char replaygain_track_gain[] = "replaygain_track_gain";
+	static char replaygain_album_gain[] = "replaygain_album_gain";
+	static char replaygain_track_peak[] = "replaygain_track_peak";
+	static char replaygain_album_peak[] = "replaygain_album_peak";
 	ReplayGainInfo *replayGainInfo;
 	int found = 0;
 	char *value;
 
 	replayGainInfo = newReplayGainInfo();
 
-	value = wavpack_tag(wpc, "replaygain_track_gain");
+	value = wavpack_tag(wpc, replaygain_track_gain);
 	if (value) {
 		replayGainInfo->trackGain = atof(value);
 		free(value);
 		found = 1;
 	}
 
-	value = wavpack_tag(wpc, "replaygain_album_gain");
+	value = wavpack_tag(wpc, replaygain_album_gain);
 	if (value) {
 		replayGainInfo->albumGain = atof(value);
 		free(value);
 		found = 1;
 	}
 
-	value = wavpack_tag(wpc, "replaygain_track_peak");
+	value = wavpack_tag(wpc, replaygain_track_peak);
 	if (value) {
 		replayGainInfo->trackPeak = atof(value);
 		free(value);
 		found = 1;
 	}
 
-	value = wavpack_tag(wpc, "replaygain_album_peak");
+	value = wavpack_tag(wpc, replaygain_album_peak);
 	if (value) {
 		replayGainInfo->albumPeak = atof(value);
 		free(value);
-- 
cgit v1.2.3