oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

fix -Wconst warnings

Browse Source 
[ew: cleaned up the dirty union hack a bit]
Signed-off-by: Eric Wong <normalperson@yhbt.net>

git-svn-id: https://svn.musicpd.org/mpd/trunk@7180 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Max Kellermann
2008-02-05 10:17:33 +00:00
committed by Eric Wong
parent 22efbd5eca
commit 6fbdc721d9
37 changed files with 223 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/inputPlugins/audiofile_plugin.c
View File

@@ -149,7 +149,7 @@ static MpdTag *audiofileTagDup(char *file)
return ret;
}
static char *audiofileSuffixes[] = { "wav", "au", "aiff", "aif", NULL };
static const char *audiofileSuffixes[] = { "wav", "au", "aiff", "aif", NULL };
InputPlugin audiofilePlugin = {
"audiofile",

18
src/inputPlugins/flac_plugin.c
View File

@@ -473,11 +473,11 @@ static unsigned int oggflac_try_decode(InputStream * inStream)
return (ogg_stream_type_detect(inStream) == FLAC) ? 1 : 0;
}
static char *oggflac_suffixes[] = { "ogg", "oga", NULL };
static char *oggflac_mime_types[] = { "audio/x-flac+ogg",
"application/ogg",
"application/x-ogg",
NULL };
static const char *oggflac_suffixes[] = { "ogg", "oga", NULL };
static const char *oggflac_mime_types[] = { "audio/x-flac+ogg",
"application/ogg",
"application/x-ogg",
NULL };
static int flac_plugin_init(void)
{
@@ -501,10 +501,10 @@ static int flac_plugin_init(void)
#endif /* FLAC_API_VERSION_CURRENT >= 7 */
static char *flacSuffixes[] = { "flac", NULL };
static char *flac_mime_types[] = { "audio/x-flac",
"application/x-flac",
NULL };
static const char *flacSuffixes[] = { "flac", NULL };
static const char *flac_mime_types[] = { "audio/x-flac",
"application/x-flac",
NULL };
InputPlugin flacPlugin = {
"flac",

2
src/inputPlugins/mod_plugin.c
View File

@@ -249,7 +249,7 @@ static MpdTag *modTagDup(char *file)
return ret;
}
static char *modSuffixes[] = { "amf",
static const char *modSuffixes[] = { "amf",
"dsm",
"far",
"gdm",

4
src/inputPlugins/mp3_plugin.c
View File

@@ -1111,8 +1111,8 @@ static MpdTag *mp3_tagDup(char *file)
return ret;
}
static char *mp3_suffixes[] = { "mp3", "mp2", NULL };
static char *mp3_mimeTypes[] = { "audio/mpeg", NULL };
static const char *mp3_suffixes[] = { "mp3", "mp2", NULL };
static const char *mp3_mimeTypes[] = { "audio/mpeg", NULL };
InputPlugin mp3Plugin = {
"mp3",

2
src/inputPlugins/mpc_plugin.c
View File

@@ -317,7 +317,7 @@ static MpdTag *mpcTagDup(char *file)
return ret;
}
static char *mpcSuffixes[] = { "mpc", NULL };
static const char *mpcSuffixes[] = { "mpc", NULL };
InputPlugin mpcPlugin = {
"mpc",

10
src/inputPlugins/oggflac_plugin.c
View File

@@ -390,11 +390,11 @@ fail:
return ret;
}
static char *oggflac_Suffixes[] = { "ogg", NULL };
static char *oggflac_mime_types[] = { "audio/x-flac+ogg",
"application/ogg",
"application/x-ogg",
NULL };
static const char *oggflac_Suffixes[] = { "ogg", NULL };
static const char *oggflac_mime_types[] = { "audio/x-flac+ogg",
"application/ogg",
"application/x-ogg",
NULL };
InputPlugin oggflacPlugin = {
"oggflac",

20
src/inputPlugins/oggvorbis_plugin.c
View File

@@ -80,7 +80,7 @@ static size_t ogg_read_cb(void *ptr, size_t size, size_t nmemb, void *vdata)
static int ogg_seek_cb(void *vdata, ogg_int64_t offset, int whence)
{
OggCallbackData *data = (OggCallbackData *) vdata;
const OggCallbackData *data = (const OggCallbackData *) vdata;
if(data->dc->stop)
return -1;
return seekInputStream(data->inStream, offset, whence);
@@ -94,12 +94,12 @@ static int ogg_close_cb(void *vdata)
static long ogg_tell_cb(void *vdata)
{
OggCallbackData *data = (OggCallbackData *) vdata;
const OggCallbackData *data = (const OggCallbackData *) vdata;
return (long)(data->inStream->offset);
}
static char *ogg_parseComment(char *comment, char *needle)
static const char *ogg_parseComment(const char *comment, const char *needle)
{
int len = strlen(needle);
@@ -112,7 +112,7 @@ static char *ogg_parseComment(char *comment, char *needle)
static void ogg_getReplayGainInfo(char **comments, ReplayGainInfo ** infoPtr)
{
char *temp;
const char *temp;
int found = 0;
if (*infoPtr)
@@ -236,7 +236,7 @@ static int oggvorbis_decode(OutputBuffer * cb, DecoderControl * dc,
long test;
ReplayGainInfo *replayGainInfo = NULL;
char **comments;
char *errorStr;
const char *errorStr;
data.inStream = inStream;
data.dc = dc;
@@ -383,11 +383,11 @@ static unsigned int oggvorbis_try_decode(InputStream * inStream)
return (ogg_stream_type_detect(inStream) == VORBIS) ? 1 : 0;
}
static char *oggvorbis_Suffixes[] = { "ogg", NULL };
static char *oggvorbis_MimeTypes[] = { "application/ogg",
"audio/x-vorbis+ogg",
"application/x-ogg",
NULL };
static const char *oggvorbis_Suffixes[] = { "ogg", NULL };
static const char *oggvorbis_MimeTypes[] = { "application/ogg",
"audio/x-vorbis+ogg",
"application/x-ogg",
NULL };
InputPlugin oggvorbisPlugin = {
"oggvorbis",