Merge svn changes up to r30748

8 files changed, 47 insertions, 47 deletions

diff --git a/stream/http.c b/stream/http.c
index bda6c060c7..d79f7632ca 100644
--- a/stream/http.c
+++ b/stream/http.c
@@ -332,7 +332,7 @@ http_response_append( HTTP_header_t *http_hdr, char *response, int length ) {
 		mp_msg(MSGT_NETWORK,MSGL_FATAL,"Bad size in memory (re)allocation\n");
 		return -1;
 	}
-	http_hdr->buffer = (char*)realloc( http_hdr->buffer, http_hdr->buffer_size+length+1 );
+	http_hdr->buffer = realloc( http_hdr->buffer, http_hdr->buffer_size+length+1 );
 	if( http_hdr->buffer==NULL ) {
 		mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory (re)allocation failed\n");
 		return -1;
@@ -428,7 +428,7 @@ http_response_parse( HTTP_header_t *http_hdr ) {
 		while( *ptr!='\r' && *ptr!='\n' ) ptr++;
 		len = ptr-hdr_ptr;
 		if( len==0 ) break;
-		field = (char*)realloc(field, len+1);
+		field = realloc(field, len+1);
 		if( field==NULL ) {
 			mp_msg(MSGT_NETWORK,MSGL_ERR,"Memory allocation failed\n");
 			return -1;
@@ -520,7 +520,7 @@ char *
 http_get_field( HTTP_header_t *http_hdr, const char *field_name ) {
 	if( http_hdr==NULL || field_name==NULL ) return NULL;
 	http_hdr->field_search_pos = http_hdr->first_field;
-	http_hdr->field_search = (char*)realloc( http_hdr->field_search, strlen(field_name)+1 );
+	http_hdr->field_search = realloc( http_hdr->field_search, strlen(field_name)+1 );
 	if( http_hdr->field_search==NULL ) {
 		mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n");
 		return NULL;
diff --git a/stream/open.c b/stream/open.c
index 77157aff5a..f5323eb2fa 100644
--- a/stream/open.c
+++ b/stream/open.c
@@ -47,7 +47,8 @@ int dvd_title=0;
 
 // Open a new stream  (stdin/file/vcd/url)
 
-stream_t* open_stream(char* filename, struct MPOpts *options, int* file_format)
+stream_t* open_stream(const char *filename, struct MPOpts *options,
+                      int *file_format)
 {
   // Check if playlist or unknown
   if (*file_format != DEMUXER_TYPE_PLAYLIST){
diff --git a/stream/stream.c b/stream/stream.c
index 562675cb29..af194f3a3d 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -142,7 +142,8 @@ static const stream_info_t* const auto_open_streams[] = {
   NULL
 };
 
-static stream_t *open_stream_plugin(const stream_info_t *sinfo, char *filename,
+static stream_t *open_stream_plugin(const stream_info_t *sinfo,
+                                    const char *filename,
                                     int mode, struct MPOpts *options,
                                     int *file_format, int *ret,
                                     char **redirected_url)
@@ -202,8 +203,8 @@ static stream_t *open_stream_plugin(const stream_info_t *sinfo, char *filename,
 }
 
 
-stream_t *open_stream_full(char *filename,int mode, struct MPOpts *options,
-                           int* file_format)
+stream_t *open_stream_full(const char *filename, int mode,
+                           struct MPOpts *options, int *file_format)
 {
   int i,j,l,r;
   const stream_info_t* sinfo;
@@ -246,7 +247,7 @@ stream_t *open_stream_full(char *filename,int mode, struct MPOpts *options,
   return NULL;
 }
 
-stream_t *open_output_stream(char *filename, struct MPOpts *options)
+stream_t *open_output_stream(const char *filename, struct MPOpts *options)
 {
   int file_format; //unused
   if(!filename) {
diff --git a/stream/stream.h b/stream/stream.h
index c48dd2a8b2..c02961f1df 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -345,9 +345,11 @@ int stream_control(stream_t *s, int cmd, void *arg);
 stream_t* new_stream(int fd,int type);
 void free_stream(stream_t *s);
 stream_t* new_memory_stream(unsigned char* data,int len);
-stream_t* open_stream(char* filename, struct MPOpts *options,int* file_format);
-stream_t* open_stream_full(char* filename,int mode, struct MPOpts *options, int* file_format);
-stream_t* open_output_stream(char* filename,struct MPOpts *options);
+stream_t *open_stream(const char *filename, struct MPOpts *options,
+                      int *file_format);
+stream_t *open_stream_full(const char *filename,int mode,
+                           struct MPOpts *options, int *file_format);
+stream_t *open_output_stream(const char *filename, struct MPOpts *options);
 /// Set the callback to be used by libstream to check for user
 /// interruption during long blocking operations (cache filling, etc).
 struct input_ctx;
diff --git a/stream/stream_cddb.c b/stream/stream_cddb.c
index c83acfb633..d6fe4f1881 100644
--- a/stream/stream_cddb.c
+++ b/stream/stream_cddb.c
@@ -81,12 +81,10 @@
 #define DEFAULT_FREEDB_SERVER "freedb.freedb.org"
 #define DEFAULT_CACHE_DIR     "/.cddb/"
 
-stream_t* open_cdda(char *dev, char *track);
-
 static cd_toc_t cdtoc[100];
 static int cdtoc_last_track;
 
-int read_toc(const char *dev)
+static int read_toc(const char *dev)
 {
     int first = 0, last = -1;
     int i;
@@ -255,7 +253,7 @@ int cdd_identify(const char *dev)
     return cdtoc_last_track;
 }
 
-unsigned int cddb_sum(int n)
+static unsigned int cddb_sum(int n)
 {
     unsigned int ret;
 
@@ -267,7 +265,7 @@ unsigned int cddb_sum(int n)
     return ret;
 }
 
-unsigned long cddb_discid(int tot_trks)
+static unsigned long cddb_discid(int tot_trks)
 {
     unsigned int i, t = 0, n = 0;
 
@@ -283,7 +281,7 @@ unsigned long cddb_discid(int tot_trks)
 
 
 
-int cddb_http_request(char *command,
+static int cddb_http_request(char *command,
                       int (*reply_parser)(HTTP_header_t*, cddb_data_t*),
                       cddb_data_t *cddb_data)
 {
@@ -338,7 +336,7 @@ int cddb_http_request(char *command,
     return ret;
 }
 
-int cddb_read_cache(cddb_data_t *cddb_data)
+static int cddb_read_cache(cddb_data_t *cddb_data)
 {
     char file_name[100];
     struct stat stats;
@@ -383,7 +381,7 @@ int cddb_read_cache(cddb_data_t *cddb_data)
     return 0;
 }
 
-int cddb_write_cache(cddb_data_t *cddb_data)
+static int cddb_write_cache(cddb_data_t *cddb_data)
 {
     // We have the file, save it for cache.
     struct stat file_stat;
@@ -436,7 +434,7 @@ int cddb_write_cache(cddb_data_t *cddb_data)
     return 0;
 }
 
-int cddb_read_parse(HTTP_header_t *http_hdr, cddb_data_t *cddb_data)
+static int cddb_read_parse(HTTP_header_t *http_hdr, cddb_data_t *cddb_data)
 {
     unsigned long disc_id;
     char category[100];
@@ -495,7 +493,7 @@ int cddb_read_parse(HTTP_header_t *http_hdr, cddb_data_t *cddb_data)
     return 0;
 }
 
-int cddb_request_titles(cddb_data_t *cddb_data)
+static int cddb_request_titles(cddb_data_t *cddb_data)
 {
     char command[1024];
     sprintf(command, "cddb+read+%s+%08lx",
@@ -503,7 +501,7 @@ int cddb_request_titles(cddb_data_t *cddb_data)
     return cddb_http_request(command, cddb_read_parse, cddb_data);
 }
 
-int cddb_parse_matches_list(HTTP_header_t *http_hdr, cddb_data_t *cddb_data)
+static int cddb_parse_matches_list(HTTP_header_t *http_hdr, cddb_data_t *cddb_data)
 {
     char album_title[100];
     char *ptr = NULL;
@@ -541,7 +539,7 @@ int cddb_parse_matches_list(HTTP_header_t *http_hdr, cddb_data_t *cddb_data)
     return 0;
 }
 
-int cddb_query_parse(HTTP_header_t *http_hdr, cddb_data_t *cddb_data)
+static int cddb_query_parse(HTTP_header_t *http_hdr, cddb_data_t *cddb_data)
 {
     char album_title[100];
     char *ptr = NULL;
@@ -607,7 +605,7 @@ blues c711930d Santana / Supernatural
     return -1;
 }
 
-int cddb_proto_level_parse(HTTP_header_t *http_hdr, cddb_data_t *cddb_data)
+static int cddb_proto_level_parse(HTTP_header_t *http_hdr, cddb_data_t *cddb_data)
 {
     int max;
     int ret, status;
@@ -639,12 +637,12 @@ int cddb_proto_level_parse(HTTP_header_t *http_hdr, cddb_data_t *cddb_data)
     return -1;
 }
 
-int cddb_get_proto_level(cddb_data_t *cddb_data)
+static int cddb_get_proto_level(cddb_data_t *cddb_data)
 {
     return cddb_http_request("stat", cddb_proto_level_parse, cddb_data);
 }
 
-int cddb_freedb_sites_parse(HTTP_header_t *http_hdr, cddb_data_t *cddb_data)
+static int cddb_freedb_sites_parse(HTTP_header_t *http_hdr, cddb_data_t *cddb_data)
 {
     int ret, status;
 
@@ -668,12 +666,12 @@ int cddb_freedb_sites_parse(HTTP_header_t *http_hdr, cddb_data_t *cddb_data)
     return -1;
 }
 
-int cddb_get_freedb_sites(cddb_data_t *cddb_data)
+static int cddb_get_freedb_sites(cddb_data_t *cddb_data)
 {
     return cddb_http_request("sites", cddb_freedb_sites_parse, cddb_data);
 }
 
-void cddb_create_hello(cddb_data_t *cddb_data)
+static void cddb_create_hello(cddb_data_t *cddb_data)
 {
     char host_name[51];
     char *user_name;
@@ -696,7 +694,7 @@ void cddb_create_hello(cddb_data_t *cddb_data)
             user_name, host_name, "MPlayer", VERSION);
 }
 
-int cddb_retrieve(cddb_data_t *cddb_data)
+static int cddb_retrieve(cddb_data_t *cddb_data)
 {
     char offsets[1024], command[1024];
     char *ptr;
@@ -804,7 +802,7 @@ int cddb_resolve(const char *dev, char **xmcd_file)
 /***************
  * xmcd parser *
  ***************/
-char *xmcd_parse_dtitle(cd_info_t *cd_info, char *line)
+static char *xmcd_parse_dtitle(cd_info_t *cd_info, char *line)
 {
     char *ptr, *album;
     ptr = strstr(line, "DTITLE=");
@@ -829,7 +827,7 @@ char *xmcd_parse_dtitle(cd_info_t *cd_info, char *line)
     return ptr;
 }
 
-char *xmcd_parse_dgenre(cd_info_t *cd_info, char *line)
+static char *xmcd_parse_dgenre(cd_info_t *cd_info, char *line)
 {
     char *ptr;
     ptr = strstr(line, "DGENRE=");
@@ -844,7 +842,7 @@ char *xmcd_parse_dgenre(cd_info_t *cd_info, char *line)
     return ptr;
 }
 
-char *xmcd_parse_ttitle(cd_info_t *cd_info, char *line)
+static char *xmcd_parse_ttitle(cd_info_t *cd_info, char *line)
 {
     unsigned int track_nb;
     unsigned long sec, off;
diff --git a/stream/stream_netstream.h b/stream/stream_netstream.h
index a81bc37c83..4d3e30e849 100644
--- a/stream/stream_netstream.h
+++ b/stream/stream_netstream.h
@@ -89,8 +89,7 @@ static int net_read(int fd, char* buf, int len) {
 
 static mp_net_stream_packet_t* read_packet(int fd) {
   uint16_t len;
-  mp_net_stream_packet_t* pack =
-    (mp_net_stream_packet_t*)malloc(sizeof(mp_net_stream_packet_t));
+  mp_net_stream_packet_t* pack = malloc(sizeof(mp_net_stream_packet_t));
 
   if(!net_read(fd,(char*)pack,sizeof(mp_net_stream_packet_t))) {
     free(pack);
diff --git a/stream/tvi_def.h b/stream/tvi_def.h
index 261a8ee4cd..43de8c6423 100644
--- a/stream/tvi_def.h
+++ b/stream/tvi_def.h
@@ -47,11 +47,11 @@ static const tvi_functions_t functions =
 
 static tvi_handle_t *new_handle(void)
 {
-    tvi_handle_t *h = (tvi_handle_t *)malloc(sizeof(tvi_handle_t));
+    tvi_handle_t *h = malloc(sizeof(tvi_handle_t));
 
     if (!h)
 	return NULL;
-    h->priv = (priv_t *)malloc(sizeof(priv_t));
+    h->priv = malloc(sizeof(priv_t));
     if (!h->priv)
     {
 	free(h);
diff --git a/stream/tvi_dshow.c b/stream/tvi_dshow.c
index 0563d74f18..3a55f33e33 100644
--- a/stream/tvi_dshow.c
+++ b/stream/tvi_dshow.c
@@ -796,19 +796,19 @@ static HRESULT init_ringbuffer(grabber_ringbuffer_t * rb, int buffersize,
     mp_msg(MSGT_TV, MSGL_DBG2, "tvi_dshow: Capture buffer: %d blocks of %d bytes.\n",
 	   rb->buffersize, rb->blocksize);
 
-    rb->ringbuffer = (char **) malloc(rb->buffersize * sizeof(char *));
+    rb->ringbuffer = malloc(rb->buffersize * sizeof(char *));
     if (!rb)
 	return E_POINTER;
     memset(rb->ringbuffer, 0, rb->buffersize * sizeof(char *));
 
     for (i = 0; i < rb->buffersize; i++) {
-	rb->ringbuffer[i] = (char *) malloc(rb->blocksize * sizeof(char));
+	rb->ringbuffer[i] = malloc(rb->blocksize * sizeof(char));
 	if (!rb->ringbuffer[i]) {
 	    destroy_ringbuffer(rb);
 	    return E_OUTOFMEMORY;
 	}
     }
-    rb->dpts = (double*) malloc(rb->buffersize * sizeof(double));
+    rb->dpts = malloc(rb->buffersize * sizeof(double));
     if (!rb->dpts) {
 	destroy_ringbuffer(rb);
 	return E_OUTOFMEMORY;
@@ -817,7 +817,7 @@ static HRESULT init_ringbuffer(grabber_ringbuffer_t * rb, int buffersize,
     rb->tail = 0;
     rb->count = 0;
     rb->tStart = -1;
-    rb->pMutex = (CRITICAL_SECTION *) malloc(sizeof(CRITICAL_SECTION));
+    rb->pMutex = malloc(sizeof(CRITICAL_SECTION));
     if (!rb->pMutex) {
 	destroy_ringbuffer(rb);
 	return E_OUTOFMEMORY;
@@ -966,7 +966,7 @@ static HRESULT load_freq_table(int nCountry, int nInputType,
     }
     *pnFirst = plFreqTable[0];
     *pnLen = (int) (plFreqTable[1] - plFreqTable[0] + 1);
-    *pplFreqTable = (long *) malloc((*pnLen) * sizeof(long));
+    *pplFreqTable = malloc((*pnLen) * sizeof(long));
     if (!*pplFreqTable) {
 	FreeLibrary(hDLL);
 	return E_FAIL;
@@ -1273,7 +1273,7 @@ static void get_capabilities(priv_t * priv)
 	OLE_CALL_ARGS(priv->pCrossbar, get_PinCounts, &lOutputPins,
 		  &lInputPins);
 
-	tv_available_inputs = (long *) malloc(sizeof(long) * lInputPins);
+	tv_available_inputs = malloc(sizeof(long) * lInputPins);
 	tv_available_inputs_count = 0;
 
 	mp_tmsg(MSGT_TV, MSGL_V, "tvi_dshow: available video inputs:");
@@ -2063,11 +2063,11 @@ static HRESULT get_available_formats_stream(chain_t *chain)
     }
     done = 0;
 
-    arpmt = (AM_MEDIA_TYPE **) malloc((count + 1) * sizeof(AM_MEDIA_TYPE *));
+    arpmt = malloc((count + 1) * sizeof(AM_MEDIA_TYPE *));
     if (arpmt) {
 	memset(arpmt, 0, (count + 1) * sizeof(AM_MEDIA_TYPE *));
 
-	pBuf = (void **) malloc((count + 1) * sizeof(void *));
+	pBuf = malloc((count + 1) * sizeof(void *));
 	if (pBuf) {
 	    memset(pBuf, 0, (count + 1) * sizeof(void *));
 
@@ -2170,8 +2170,7 @@ static HRESULT get_available_formats_pin(ICaptureGraphBuilder2 * pBuilder,
     OLE_CALL(pEnum,Reset);
 
     count = i;
-    arpmt =
-	(AM_MEDIA_TYPE **) malloc((count + 1) * sizeof(AM_MEDIA_TYPE *));
+    arpmt = malloc((count + 1) * sizeof(AM_MEDIA_TYPE *));
     if (!arpmt)
 	return E_OUTOFMEMORY;
     memset(arpmt, 0, (count + 1) * sizeof(AM_MEDIA_TYPE *));
@@ -2184,7 +2183,7 @@ static HRESULT get_available_formats_pin(ICaptureGraphBuilder2 * pBuilder,
     OLE_RELEASE_SAFE(pEnum);
 
 
-    pBuf = (void **) malloc((count + 1) * sizeof(void *));
+    pBuf = malloc((count + 1) * sizeof(void *));
     if (!pBuf) {
 	for (i = 0; i < count; i++)
 	    if (arpmt[i])