Merge branch 'mk/cleanups'

* mk/cleanups: (60 commits)
  pass constant pointers
  const pointers
  unsigned integers and size_t
  oggflac: fix GCC warnings
  include cleanup
  protect locate.h from double inclusion
  playlist: eliminate unused fd parameters
  jack: made "sample_size" static const
  moved jack configuration to the JackData struct
  jack: removed unused macros
  jack: don't set audioOutput->data=NULL
  jack: initialize JackData in jack_initDriver()
  jack: added freeJackClient()
  jack: initialize jd->client after !jd check
  jack: eliminate superfluous freeJackData() calls
  mp3: converted the MUTEFRAME_ macros to an enum
  mp3: converted the DECODE_ constants to an enum
  wavpack: don't use "isp" before initialization
  wavpack: moved code to wavpack_open_wvc()
  simplified code in the ogg decoder plugin
  ...

1 files changed, 4 insertions, 2 deletions

diff --git a/src/pcm_utils.c b/src/pcm_utils.c
index 3cf57def1..f716c279d 100644
--- a/src/pcm_utils.c
+++ b/src/pcm_utils.c
@@ -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;