From 8f1b24457b1b735b348575ea42654ae361bb8fdc Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 21 Oct 2006 17:28:22 +0000 Subject: [PATCH] Fix a bunch of warning. --- include/iso_lang.h | 10 +++++----- include/vlc_input.h | 2 +- src/input/es_out.c | 6 +++--- src/misc/iso-639_def.h | 6 +++--- src/misc/messages.c | 2 +- src/misc/vlm.c | 11 ++++++----- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/include/iso_lang.h b/include/iso_lang.h index e788fcd3c0..9e0022fdb8 100644 --- a/include/iso_lang.h +++ b/include/iso_lang.h @@ -24,11 +24,11 @@ struct iso639_lang_t { - char * psz_eng_name; /* Description in English */ - char * psz_native_name; /* Description in native language */ - char * psz_iso639_1; /* ISO-639-1 (2 characters) code */ - char * psz_iso639_2T; /* ISO-639-2/T (3 characters) English code */ - char * psz_iso639_2B; /* ISO-639-2/B (3 characters) native code */ + const char * psz_eng_name; /* Description in English */ + const char * psz_native_name; /* Description in native language */ + const char * psz_iso639_1; /* ISO-639-1 (2 characters) code */ + const char * psz_iso639_2T; /* ISO-639-2/T (3 characters) English code */ + const char * psz_iso639_2B; /* ISO-639-2/B (3 characters) native code */ }; #if defined( __cplusplus ) diff --git a/include/vlc_input.h b/include/vlc_input.h index 7e2bd30789..fee622196a 100644 --- a/include/vlc_input.h +++ b/include/vlc_input.h @@ -248,7 +248,7 @@ typedef struct } input_title_t; -static inline input_title_t *vlc_input_title_New( ) +static inline input_title_t *vlc_input_title_New(void) { input_title_t *t = (input_title_t*)malloc( sizeof( input_title_t ) ); diff --git a/src/input/es_out.c b/src/input/es_out.c index 03aba946c4..a07b5a11ea 100644 --- a/src/input/es_out.c +++ b/src/input/es_out.c @@ -334,7 +334,7 @@ static void EsOutESVarUpdate( es_out_t *out, es_out_id_t *es, input_thread_t *p_input = p_sys->p_input; vlc_value_t val, text; - char *psz_var; + const char *psz_var; if( es->fmt.i_cat == AUDIO_ES ) psz_var = "audio-es"; @@ -740,7 +740,7 @@ static void EsSelect( es_out_t *out, es_out_id_t *es ) es_out_sys_t *p_sys = out->p_sys; input_thread_t *p_input = p_sys->p_input; vlc_value_t val; - char *psz_var; + const char *psz_var; if( es->p_dec ) { @@ -808,7 +808,7 @@ static void EsUnselect( es_out_t *out, es_out_id_t *es, vlc_bool_t b_update ) es_out_sys_t *p_sys = out->p_sys; input_thread_t *p_input = p_sys->p_input; vlc_value_t val; - char *psz_var; + const char *psz_var; if( es->p_dec == NULL ) { diff --git a/src/misc/iso-639_def.h b/src/misc/iso-639_def.h index 30246625fb..829ccf6cb6 100644 --- a/src/misc/iso-639_def.h +++ b/src/misc/iso-639_def.h @@ -6,7 +6,7 @@ * * This is used in iso_lang.cpp and is taken from the GNU glibc 2.2.5 * tarball. It has been partially completed with native language names. - * Authors: St�hane Borel + * Authors: Stéphane Borel * Arnaud de Bossoreille de Ribou * * This program is free software; you can redistribute it and/or modify @@ -29,9 +29,9 @@ * If you find something missing or wrong contact */ /* Some spellings were converted to pure ASCII: - * Proven�l -> Provencal + * Provençal -> Provencal * Volapk -> Volapuk - * Bokm� -> Bokmaal */ + * Bokm? -> Bokmaal */ static const iso639_lang_t p_languages[] = { diff --git a/src/misc/messages.c b/src/misc/messages.c index 9c3ea30930..0ca3bd7e6e 100644 --- a/src/misc/messages.c +++ b/src/misc/messages.c @@ -481,7 +481,7 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item ) #endif static const char * ppsz_type[4] = { "", " error", " warning", " debug" }; static const char *ppsz_color[4] = { WHITE, RED, YELLOW, GRAY }; - char *psz_object = "private"; + const char *psz_object = "private"; int i_type = p_item->i_type; switch( i_type ) diff --git a/src/misc/vlm.c b/src/misc/vlm.c index 811d47177a..4efa112e1d 100644 --- a/src/misc/vlm.c +++ b/src/misc/vlm.c @@ -49,12 +49,12 @@ /***************************************************************************** * Local prototypes. *****************************************************************************/ -static vlm_message_t *vlm_Show( vlm_t *, vlm_media_t *, vlm_schedule_t *, char * ); +static vlm_message_t *vlm_Show( vlm_t *, vlm_media_t *, vlm_schedule_t *, const char * ); static vlm_message_t *vlm_Help( vlm_t *, char * ); static vlm_media_instance_t *vlm_MediaInstanceSearch( vlm_t *, vlm_media_t *, const char * ); -static vlm_message_t *vlm_MessageNew( char *, const char *, ... ); +static vlm_message_t *vlm_MessageNew( const char *, const char *, ... ); static vlm_message_t *vlm_MessageAdd( vlm_message_t *, vlm_message_t * ); static vlm_schedule_t *vlm_ScheduleSearch( vlm_t *, const char * ); @@ -1347,7 +1347,7 @@ int vlm_MediaControl( vlm_t *vlm, vlm_media_t *media, const char *psz_id, /***************************************************************************** * Schedule handling *****************************************************************************/ -static int64_t vlm_Date() +static int64_t vlm_Date(void) { #ifdef WIN32 struct timeb tm; @@ -1610,7 +1610,7 @@ int vlm_ScheduleSetup( vlm_schedule_t *schedule, const char *psz_cmd, /***************************************************************************** * Message handling functions *****************************************************************************/ -static vlm_message_t *vlm_MessageNew( char *psz_name, +static vlm_message_t *vlm_MessageNew( const char *psz_name, const char *psz_format, ... ) { vlm_message_t *p_message; @@ -1673,7 +1673,8 @@ static vlm_message_t *vlm_MessageAdd( vlm_message_t *p_message, * Misc utility functions *****************************************************************************/ static vlm_message_t *vlm_Show( vlm_t *vlm, vlm_media_t *media, - vlm_schedule_t *schedule, char *psz_filter ) + vlm_schedule_t *schedule, + const char *psz_filter ) { if( media != NULL ) { -- 2.39.5