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, 6 insertions, 5 deletions

diff --git a/src/inputStream_http.c b/src/inputStream_http.c
index a6c715459..8802eda2b 100644
--- a/src/inputStream_http.c
+++ b/src/inputStream_http.c
@@ -461,7 +461,7 @@ static ssize_t buffer_data(InputStream *is)
 	assert(pthread_equal(data->io_thread, pthread_self()));
 	assert_state2(CONN_STATE_BUFFER, CONN_STATE_PREBUFFER);
 
-	if (!ringbuf_get_write_vector(data->rb, vec)) {
+	if (!ringbuf_get_write_vector(data->rb, (struct rbvec *)vec)) {
 		data->state = CONN_STATE_BUFFER_FULL;
 		return 0;
 	}
@@ -750,7 +750,7 @@ closed:
 	return NULL;
 }
 
-int inputStream_httpBuffer(InputStream *is)
+int inputStream_httpBuffer(mpd_unused InputStream *is)
 {
 	return 0;
 }
@@ -847,7 +847,8 @@ static void parse_icy_metadata(InputStream * is, char *metadata, size_t size)
 	}
 }
 
-static size_t read_with_metadata(InputStream *is, void *ptr, ssize_t len)
+static size_t read_with_metadata(InputStream *is, unsigned char *ptr,
+				 ssize_t len)
 {
 	struct http_data *data = (struct http_data *) is->data;
 	size_t readed = 0;
@@ -887,13 +888,13 @@ static size_t read_with_metadata(InputStream *is, void *ptr, ssize_t len)
 	return readed;
 }
 
-size_t inputStream_httpRead(InputStream * is, void *ptr, size_t size,
+size_t inputStream_httpRead(InputStream * is, void *_ptr, size_t size,
 			    size_t nmemb)
 {
 	struct http_data *data = (struct http_data *) is->data;
 	size_t len = size * nmemb;
 	size_t r;
-	void *ptr0 = ptr;
+	unsigned char *ptr = _ptr, *ptr0 = _ptr;
 	long tries = len / 128; /* try harder for bigger reads */
 
 retry: