diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio_out/audio_alsa_out.c | 5 | ||||
| -rw-r--r-- | src/libw32dll/common.c | 4 | ||||
| -rw-r--r-- | src/libw32dll/w32codec.c | 8 | ||||
| -rw-r--r-- | src/xine-utils/xmlparser.c | 6 |
4 files changed, 12 insertions, 11 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index 11130a84b..f35c51cb1 100644 --- a/src/audio_out/audio_alsa_out.c +++ b/src/audio_out/audio_alsa_out.c @@ -265,9 +265,10 @@ static long ao_alsa_get_volume_from_percent(int val, long min, long max) { /* * Error callback, we need to control this, * error message should be printed only in DEBUG mode. + * XINE_FORMAT_PRINTF(5, 6) is true but useless here, + * as alsa delivers "fmt" at runtime only. */ -static void XINE_FORMAT_PRINTF(5, 6) - error_callback(const char *file, int line, +static void error_callback(const char *file, int line, const char *function, int err, const char *fmt, ...) { #ifdef DEBUG va_list args; diff --git a/src/libw32dll/common.c b/src/libw32dll/common.c index 76c114bca..6b5268a70 100644 --- a/src/libw32dll/common.c +++ b/src/libw32dll/common.c @@ -5,7 +5,7 @@ static char *get_win32_codecs_path(config_values_t *cfg) { DIR *dir; char *path, *cfgpath; - char *listpath[] = { "", + const char *listpath[] = { "", "/usr/lib/codecs", "/usr/local/lib/codecs", "/usr/lib/win32", @@ -25,7 +25,7 @@ static char *get_win32_codecs_path(config_values_t *cfg) { while (listpath[i]) { if (i == 0) path = cfgpath; - else path = listpath[i]; + else path = (char *)listpath[i]; if ((dir = opendir(path)) != NULL) { closedir(dir); diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index e4e73b8fb..19420af19 100644 --- a/src/libw32dll/w32codec.c +++ b/src/libw32dll/w32codec.c @@ -341,7 +341,7 @@ static int get_vids_codec_n_name(w32v_decoder_t *this, int buf_type) return 0; } -static char* get_vids_codec_name(w32v_decoder_t *this, +static const char * get_vids_codec_name(w32v_decoder_t *this, int buf_type, int n) { this->yuv_supported=0; @@ -801,7 +801,7 @@ static void w32v_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { int i; for (i = 1; i <= num_decoders; i++) { - win32_codec_name = get_vids_codec_name (this, buf->type, i); + win32_codec_name = (char *)get_vids_codec_name (this, buf->type, i); if( this->driver_type == DRIVER_STD ) w32v_init_codec (this, buf->type); @@ -1072,7 +1072,7 @@ static void w32v_dispose (video_decoder_t *this_gen) { * audio stuff */ -static char* get_auds_codec_name(w32a_decoder_t *this, int buf_type) { +static const char * get_auds_codec_name(w32a_decoder_t *this, int buf_type) { buf_type = buf_type & 0xFFFF0000; this->driver_type = DRIVER_STD; @@ -1206,7 +1206,7 @@ static int w32a_init_audio (w32a_decoder_t *this, wf.cbSize = 0; this->ldt_fs = Setup_LDT_Keeper(); - win32_codec_name = get_auds_codec_name (this, buftype); + win32_codec_name = (char *)get_auds_codec_name (this, buftype); if( this->driver_type == DRIVER_STD ) { diff --git a/src/xine-utils/xmlparser.c b/src/xine-utils/xmlparser.c index f6a8d031f..60e395784 100644 --- a/src/xine-utils/xmlparser.c +++ b/src/xine-utils/xmlparser.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002-2012 the xine project + * Copyright (C) 2002-2014 the xine project * * This file is part of xine, a free video player. * @@ -220,7 +220,7 @@ static xml_node_t *xml_parser_append_text (xml_node_t *node, xml_node_t *subnode } else { /* most recent node is not CDATA - add a sibling */ subnode->next = new_xml_node (); - subnode->next->name = cdata; + subnode->next->name = (char *)cdata; subnode->next->data = strdup (text); subnode = subnode->next; } @@ -677,7 +677,7 @@ static int xml_parser_get_node (xml_parser_t *xml_parser, xml_node_t *current_no char *pname_buffer = calloc(1, pname_buffer_size); char *nname_buffer = calloc(1, nname_buffer_size); char *root_names[MAX_RECURSION + 1]; - root_names[0] = ""; + root_names[0] = (char *)""; res = xml_parser_get_node_internal (xml_parser, &token_buffer, &token_buffer_size, |