From: Rémi Denis-Courmont Date: Mon, 13 Nov 2006 15:43:19 +0000 (+0000) Subject: Fix another bunch of warnings X-Git-Tag: 0.9.0-test0~9461 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=da7262d76793cf824d1b6aafc472eb84b01e5612;p=vlc Fix another bunch of warnings --- diff --git a/include/libvlc_internal.h b/include/libvlc_internal.h index da05bfa2e6..6af7e53ab8 100644 --- a/include/libvlc_internal.h +++ b/include/libvlc_internal.h @@ -39,8 +39,8 @@ int libvlc_InternalInit( libvlc_int_t *, int, char *ppsz_argv[] ); int libvlc_InternalCleanup( libvlc_int_t * ); int libvlc_InternalDestroy( libvlc_int_t *, vlc_bool_t ); -int libvlc_InternalAddIntf( libvlc_int_t *, char const *, vlc_bool_t, - vlc_bool_t, int, char ** ); +int libvlc_InternalAddIntf( libvlc_int_t *, const char *, vlc_bool_t, + vlc_bool_t, int, const char *const * ); /*************************************************************************** * Opaque structures for libvlc API diff --git a/include/vlc_interface.h b/include/vlc_interface.h index b01d2356f4..9642341f29 100644 --- a/include/vlc_interface.h +++ b/include/vlc_interface.h @@ -114,7 +114,7 @@ struct intf_dialog_args_t * Prototypes *****************************************************************************/ #define intf_Create(a,b,c,d) __intf_Create(VLC_OBJECT(a),b,c,d) -VLC_EXPORT( intf_thread_t *, __intf_Create, ( vlc_object_t *, const char *, int, char ** ) ); +VLC_EXPORT( intf_thread_t *, __intf_Create, ( vlc_object_t *, const char *, int, const char *const * ) ); VLC_EXPORT( int, intf_RunThread, ( intf_thread_t * ) ); VLC_EXPORT( void, intf_StopThread, ( intf_thread_t * ) ); VLC_EXPORT( void, intf_Destroy, ( intf_thread_t * ) ); diff --git a/include/vlc_symbols.h b/include/vlc_symbols.h index cdedfdc132..bfe87f6484 100644 --- a/include/vlc_symbols.h +++ b/include/vlc_symbols.h @@ -234,7 +234,7 @@ struct module_symbols_t decoder_t * (*input_DecoderNew_inner) (input_thread_t *, es_format_t *, vlc_bool_t b_force_decoder); void (*input_DecoderDelete_inner) (decoder_t *); void (*input_DecoderDecode_inner) (decoder_t *, block_t *); - intf_thread_t * (*__intf_Create_inner) (vlc_object_t *, const char *, int, char **); + intf_thread_t * (*__intf_Create_inner) (vlc_object_t *, const char *, int, const char *const *); int (*intf_RunThread_inner) (intf_thread_t *); void (*intf_StopThread_inner) (intf_thread_t *); void (*intf_Destroy_inner) (intf_thread_t *); diff --git a/src/interface/interface.c b/src/interface/interface.c index 581092c79f..0ba74da81b 100644 --- a/src/interface/interface.c +++ b/src/interface/interface.c @@ -91,7 +91,7 @@ static void Manager( intf_thread_t *p_intf ); * \return a pointer to the created interface thread, NULL on error */ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module, - int i_options, char **ppsz_options ) + int i_options, const char *const *ppsz_options ) { intf_thread_t * p_intf; int i; @@ -320,7 +320,7 @@ static void Manager( intf_thread_t *p_intf ) *****************************************************************************/ static void RunInterface( intf_thread_t *p_intf ) { - static char *ppsz_interfaces[] = + static const char *ppsz_interfaces[] = { "skins2", "Skins 2", #ifndef WIN32 @@ -328,7 +328,7 @@ static void RunInterface( intf_thread_t *p_intf ) #endif NULL, NULL }; - char **ppsz_parser; + const char **ppsz_parser; vlc_list_t *p_list; int i; @@ -351,8 +351,8 @@ static void RunInterface( intf_thread_t *p_intf ) module_t *p_module = (module_t *)p_list->p_values[i].p_object; if( !strcmp( p_module->psz_object_name, ppsz_parser[0] ) ) { - val.psz_string = ppsz_parser[0]; - text.psz_string = _(ppsz_parser[1]); + val.psz_string = (char *)ppsz_parser[0]; + text.psz_string = (char *)_(ppsz_parser[1]); var_Change( p_intf, "intf-switch", VLC_VAR_ADDCHOICE, &val, &text ); break; @@ -369,15 +369,19 @@ static void RunInterface( intf_thread_t *p_intf ) text.psz_string = _("Add Interface"); var_Change( p_intf, "intf-add", VLC_VAR_SETTEXT, &text, NULL ); - val.psz_string = "rc"; text.psz_string = "Console"; + val.psz_string = (char *)"rc"; text.psz_string = (char *)"Console"; var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "telnet"; text.psz_string = _("Telnet Interface"); + val.psz_string = (char *)"telnet"; + text.psz_string = (char *)_("Telnet Interface"); var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "http"; text.psz_string = _("Web Interface"); + val.psz_string = (char *)"http"; + text.psz_string = (char *)_("Web Interface"); var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "logger"; text.psz_string = _("Debug logging"); + val.psz_string = (char *)"logger"; + text.psz_string = (char *)_("Debug logging"); var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "gestures"; text.psz_string = _("Mouse Gestures"); + val.psz_string = (char *)"gestures"; + text.psz_string = (char *)_("Mouse Gestures"); var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); var_AddCallback( p_intf, "intf-add", AddIntfCallback, NULL ); diff --git a/src/libvlc-common.c b/src/libvlc-common.c index 2db1fbf00c..bb70edf575 100644 --- a/src/libvlc-common.c +++ b/src/libvlc-common.c @@ -745,7 +745,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] ) #ifdef HAVE_SYSLOG_H if( config_GetInt( p_libvlc, "syslog" ) == 1 ) { - char *psz_logmode = "logmode=syslog"; + const char *psz_logmode = "logmode=syslog"; libvlc_InternalAddIntf( 0, "logger,none", VLC_FALSE, VLC_FALSE, 1, &psz_logmode ); } @@ -920,7 +920,7 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release ) int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module, vlc_bool_t b_block, vlc_bool_t b_play, - int i_options, char **ppsz_options ) + int i_options, const char *const *ppsz_options ) { int i_err; intf_thread_t *p_intf; @@ -977,7 +977,7 @@ static void SetLanguage ( char const *psz_lang ) #if defined( ENABLE_NLS ) \ && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) - char * psz_path; + const char * psz_path; #if defined( __APPLE__ ) || defined ( WIN32 ) || defined( SYS_BEOS ) char psz_tmp[1024]; #endif