Skip to content

M
mpd
Commit a383f451 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

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.
parent d05c8fd4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 50 deletions
configure.ac
View file @ a383f451
......@@ -26,11 +26,12 @@ if test x$GCC = xyes
then
MPD_CHECK_FLAG([-Wall])
MPD_CHECK_FLAG([-Wextra])
MPD_CHECK_FLAG([-Wno-unused-parameter])
MPD_CHECK_FLAG([-Wno-deprecated-declarations])
MPD_CHECK_FLAG([-Wmissing-prototypes])
MPD_CHECK_FLAG([-Wdeclaration-after-statement])
MPD_CHECK_FLAG([-Wshadow])
MPD_CHECK_FLAG([-Wpointer-arith])
MPD_CHECK_FLAG([-Wstrict-prototypes])
fi
if test -z "$prefix" || test "x$prefix" = xNONE; then
......
src/audioOutputs/audioOutput_ao.c
View file @ a383f451
......@@ -158,7 +158,7 @@ static void audioOutputAo_finishDriver(AudioOutput * audioOutput)
ao_shutdown();
}
static void audioOutputAo_dropBufferedAudio(AudioOutput * audioOutput)
static void audioOutputAo_dropBufferedAudio(mpd_unused AudioOutput * audioOutput)
{
/* not supported by libao */
}
......
src/audioOutputs/audioOutput_jack.c
View file @ a383f451
......@@ -102,7 +102,7 @@ static void jack_finishDriver(AudioOutput *audioOutput)
freeJackData(audioOutput);
}
static int srate(jack_nframes_t rate, void *data)
static int srate(mpd_unused jack_nframes_t rate, void *data)
{
JackData *jd = (JackData *) ((AudioOutput*) data)->data;
AudioFormat *audioFormat = &(((AudioOutput*) data)->outAudioFormat);
......@@ -366,7 +366,7 @@ static void jack_closeDevice(AudioOutput * audioOutput)
DEBUG("jack_closeDevice (pid=%d)\n", getpid());
}
static void jack_dropBufferedAudio (AudioOutput * audioOutput)
static void jack_dropBufferedAudio (mpd_unused AudioOutput * audioOutput)
{
}
......
src/audioOutputs/audioOutput_null.c
View file @ a383f451
......@@ -19,7 +19,8 @@
#include "../audioOutput.h"
#include "../timer.h"
static int null_initDriver(AudioOutput *audioOutput, ConfigParam *param)
static int null_initDriver(AudioOutput *audioOutput,
mpd_unused ConfigParam *param)
{
audioOutput->data = NULL;
return 0;
......@@ -43,7 +44,7 @@ static void null_closeDevice(AudioOutput *audioOutput)
}
static int null_playAudio(AudioOutput *audioOutput,
const char *playChunk, size_t size)
mpd_unused const char *playChunk, size_t size)
{
Timer *timer = audioOutput->data;
......
src/audioOutputs/audioOutput_oss.c
View file @ a383f451
......@@ -334,7 +334,8 @@ static int oss_testDefault(void)
return -1;
}
static int oss_open_default(AudioOutput *ao, ConfigParam *param, OssData *od)
static int oss_open_default(mpd_unused AudioOutput *ao, ConfigParam *param,
OssData *od)
{
int i;
int err[ARRAY_SIZE(default_devices)];
......
src/dbUtils.c
View file @ a383f451
......@@ -45,7 +45,8 @@ typedef struct _SearchStats {
unsigned long playTime;
} SearchStats;
static int countSongsInDirectory(int fd, Directory * directory, void *data)
static int countSongsInDirectory(mpd_unused int fd, Directory * directory,
void *data)
{
int *count = (int *)data;
......@@ -55,7 +56,7 @@ static int countSongsInDirectory(int fd, Directory * directory, void *data)
}
static int printDirectoryInDirectory(int fd, Directory * directory,
void *data)
mpd_unused void *data)
{
if (directory->path) {
fdprintf(fd, "directory: %s\n", getDirectoryPath(directory));
......@@ -63,7 +64,7 @@ static int printDirectoryInDirectory(int fd, Directory * directory,
return 0;
}
static int printSongInDirectory(int fd, Song * song, void *data)
static int printSongInDirectory(int fd, Song * song, mpd_unused void *data)
{
printSongUrl(fd, song);
return 0;
......@@ -133,7 +134,7 @@ static void printSearchStats(int fd, SearchStats *stats)
fdprintf(fd, "playtime: %li\n", stats->playTime);
}
static int searchStatsInDirectory(int fd, Song * song, void *data)
static int searchStatsInDirectory(mpd_unused int fd, Song * song, void *data)
{
SearchStats *stats = data;
......@@ -171,7 +172,8 @@ int printAllIn(int fd, char *name)
printDirectoryInDirectory, NULL);
}
static int directoryAddSongToPlaylist(int fd, Song * song, void *data)
static int directoryAddSongToPlaylist(int fd, Song * song,
mpd_unused void *data)
{
return addSongToPlaylist(fd, song, NULL);
}
......@@ -194,12 +196,12 @@ int addAllInToStoredPlaylist(int fd, char *name, char *utf8file)
(void *)utf8file);
}
static int directoryPrintSongInfo(int fd, Song * song, void *data)
static int directoryPrintSongInfo(int fd, Song * song, mpd_unused void *data)
{
return printSongInfo(fd, song);
}
static int sumSongTime(int fd, Song * song, void *data)
static int sumSongTime(mpd_unused int fd, Song * song, void *data)
{
unsigned long *sum_time = (unsigned long *)data;
......@@ -307,7 +309,8 @@ int listAllUniqueTags(int fd, int type, int numConditionals,
return ret;
}
static int sumSavedFilenameMemoryInDirectory(int fd, Directory * dir,
static int sumSavedFilenameMemoryInDirectory(mpd_unused int fd,
Directory * dir,
void *data)
{
int *sum = data;
......@@ -321,7 +324,8 @@ static int sumSavedFilenameMemoryInDirectory(int fd, Directory * dir,
return 0;
}
static int sumSavedFilenameMemoryInSong(int fd, Song * song, void *data)
static int sumSavedFilenameMemoryInSong(mpd_unused int fd, Song * song,
void *data)
{
int *sum = data;
......
src/inputPlugins/_flac_common.c
View file @ a383f451
......@@ -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;
......
src/inputPlugins/flac_plugin.c
View file @ a383f451
......@@ -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);
......
src/inputPlugins/oggvorbis_plugin.c
View file @ a383f451
......@@ -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;
}
......
src/inputPlugins/wavpack_plugin.c
View file @ a383f451
......@@ -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;
......
src/inputStream_file.c
View file @ a383f451
......@@ -106,7 +106,7 @@ int inputStream_fileAtEOF(InputStream * inStream)
return 0;
}
int inputStream_fileBuffer(InputStream * inStream)
int inputStream_fileBuffer(mpd_unused InputStream * inStream)
{
return 0;
}
src/inputStream_http.c
View file @ a383f451
......@@ -750,7 +750,7 @@ closed:
return NULL;
}
int inputStream_httpBuffer(InputStream *is)
int inputStream_httpBuffer(mpd_unused InputStream *is)
{
return 0;
}
......
src/main.c
View file @ a383f451
......@@ -352,7 +352,7 @@ static void cleanUpPidFile(void)
unlink(pidFileParam->value);
}
static void killFromPidFile(char *cmd, int killOption)
static void killFromPidFile(void)
{
FILE *fp;
ConfigParam *pidFileParam = parseConfigFilePath(CONF_PID_FILE, 0);
......@@ -391,7 +391,7 @@ int main(int argc, char *argv[])
parseOptions(argc, argv, &options);
if (options.kill)
killFromPidFile(argv[0], options.kill);
killFromPidFile();
initStats();
initTagConfig();
......
src/pcm_utils.c
View file @ a383f451
......@@ -258,9 +258,11 @@ static size_t pcm_convertSampleRate(mpd_sint8 channels, mpd_uint32 inSampleRate,
#else /* !HAVE_LIBSAMPLERATE */
/* resampling code blatantly ripped from ESD */
static size_t pcm_convertSampleRate(mpd_sint8 channels, mpd_uint32 inSampleRate,
const char *inBuffer, size_t inSize,
const char *inBuffer,
mpd_unused size_t inSize,
mpd_uint32 outSampleRate, char *outBuffer,
size_t outSize, ConvState *convState)
size_t outSize,
mpd_unused ConvState *convState)
{
mpd_uint32 rd_dat = 0;
mpd_uint32 wr_dat = 0;
......
src/player.c
View file @ a383f451
......@@ -126,7 +126,7 @@ int playerPlay(int fd, Song * song)
return 0;
}
int playerStop(int fd)
int playerStop(mpd_unused int fd)
{
if (pc.state != PLAYER_STATE_STOP) {
pc.stop = 1;
......@@ -144,7 +144,7 @@ void playerKill(void) /* deprecated */
playerPause(STDERR_FILENO);
}
int playerPause(int fd)
int playerPause(mpd_unused int fd)
{
if (pc.state != PLAYER_STATE_STOP) {
pc.pause = 1;
......
src/playlist.c
View file @ a383f451
......@@ -1258,7 +1258,7 @@ int previousSongInPlaylist(int fd)
}
}
int shufflePlaylist(int fd)
int shufflePlaylist(mpd_unused int fd)
{
int i;
int ri;
......
src/sig_handlers.c
View file @ a383f451
......@@ -47,7 +47,7 @@ int handlePendingSignals(void)
return 0;
}
static void chldSigHandler(int sig)
static void chldSigHandler(mpd_unused int sig)
{
int status;
int pid;
......
src/tree.c
View file @ a383f451
......@@ -171,8 +171,7 @@ _SplitNode(TreeNode * node)
static
void
_InsertNodeAndData(Tree * tree,
TreeNode * node,
_InsertNodeAndData(TreeNode * node,
int pos,
TreeNode * newNode,
TreeKeyData keyData)
......@@ -204,8 +203,7 @@ _InsertNodeAndData(Tree * tree,
static
TreeKeyData
_AddDataToSplitNodes(Tree * tree,
TreeNode * lessNode,
_AddDataToSplitNodes(TreeNode * lessNode,
TreeNode * moreNode,
int pos,
TreeNode * newNode,
......@@ -217,7 +215,7 @@ _AddDataToSplitNodes(Tree * tree,
if (pos <= lessNode->count)
{
_InsertNodeAndData(tree, lessNode, pos, newNode, keyData);
_InsertNodeAndData(lessNode, pos, newNode, keyData);
lessNode->count--;
retKeyData = lessNode->keyData[lessNode->count];
_ClearKeyData(&(lessNode->keyData[lessNode->count]));
......@@ -277,8 +275,7 @@ _InsertAt(TreeIterator * iter, TreeKeyData keyData)
TreeNode * newNode = _SplitNode(node);
/* insert data in split nodes */
keyData = _AddDataToSplitNodes(iter->tree,
node,
keyData = _AddDataToSplitNodes(node,
newNode,
pos,
insertNode,
......@@ -306,8 +303,7 @@ _InsertAt(TreeIterator * iter, TreeKeyData keyData)
else
{
/* insert the data and newNode */
_InsertNodeAndData(iter->tree,
node,
_InsertNodeAndData(node,
pos,
insertNode,
keyData);
......
src/volume.c
View file @ a383f451
......@@ -469,7 +469,7 @@ int getVolumeLevel(void)
}
}
static int changeSoftwareVolume(int fd, int change, int rel)
static int changeSoftwareVolume(mpd_unused int fd, int change, int rel)
{
int new = change;
......
src/zeroconf.c
View file @ a383f451
......@@ -94,7 +94,7 @@ struct AvahiTimeout {
static AvahiWatch *avahiWatchList;
static AvahiTimeout *avahiTimeoutList;
static AvahiWatch *avahiWatchNew(const AvahiPoll * api, int fd,
static AvahiWatch *avahiWatchNew(mpd_unused const AvahiPoll * api, int fd,
AvahiWatchEvent event,
AvahiWatchCallback callback, void *userdata)
{
......@@ -177,7 +177,7 @@ static void avahiTimeoutFree(AvahiTimeout * t)
free(t);
}
static AvahiTimeout *avahiTimeoutNew(const AvahiPoll * api,
static AvahiTimeout *avahiTimeoutNew(mpd_unused const AvahiPoll * api,
const struct timeval *tv,
AvahiTimeoutCallback callback,
void *userdata)
......@@ -201,7 +201,8 @@ static AvahiTimeout *avahiTimeoutNew(const AvahiPoll * api,
/* Callback when the EntryGroup changes state */
static void avahiGroupCallback(AvahiEntryGroup * g,
AvahiEntryGroupState state, void *userdata)
AvahiEntryGroupState state,
mpd_unused void *userdata)
{
char *n;
assert(g);
......@@ -291,7 +292,7 @@ fail:
/* Callback when avahi changes state */
static void avahiClientCallback(AvahiClient * c, AvahiClientState state,
void *userdata)
mpd_unused void *userdata)
{
int reason;
assert(c);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment