Commit 0a5bd123 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Fix warning, and make config_end constant

parent 5593777b
...@@ -195,7 +195,7 @@ VLC_EXPORT( void, __config_ResetAll, ( vlc_object_t * ) ); ...@@ -195,7 +195,7 @@ VLC_EXPORT( void, __config_ResetAll, ( vlc_object_t * ) );
VLC_EXPORT( module_config_t *, config_FindConfig,( vlc_object_t *, const char * ) ); VLC_EXPORT( module_config_t *, config_FindConfig,( vlc_object_t *, const char * ) );
VLC_EXPORT( module_t *, config_FindModule,( vlc_object_t *, const char * ) ); VLC_EXPORT( module_t *, config_FindModule,( vlc_object_t *, const char * ) );
VLC_EXPORT( void, config_Duplicate, ( module_t *, module_config_t * ) ); VLC_EXPORT( void, config_Duplicate, ( module_t *, const module_config_t * ) );
void config_Free ( module_t * ); void config_Free ( module_t * );
VLC_EXPORT( void, config_SetCallbacks, ( module_config_t *, module_config_t * ) ); VLC_EXPORT( void, config_SetCallbacks, ( module_config_t *, module_config_t * ) );
......
...@@ -104,11 +104,11 @@ E_(vlc_entry) ( module_t *p_module ); ...@@ -104,11 +104,11 @@ E_(vlc_entry) ( module_t *p_module );
{ \ { \
int i_shortcut = 1, i_config = -1; \ int i_shortcut = 1, i_config = -1; \
module_config_t *p_config = NULL; \ module_config_t *p_config = NULL; \
static module_config_t config_end = { \ static const module_config_t config_end = { \
CONFIG_HINT_END, NULL, NULL, 0, NULL, NULL, NULL, 0, 0., 0, 0, \ CONFIG_HINT_END, NULL, NULL, 0, NULL, NULL, NULL, 0, 0., 0, 0, \
0., 0., NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0, NULL, \ 0., 0., NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0, NULL, \
VLC_FALSE, NULL, VLC_FALSE, VLC_FALSE, VLC_FALSE, VLC_FALSE, \ VLC_FALSE, NULL, VLC_FALSE, VLC_FALSE, VLC_FALSE, VLC_FALSE, \
NULL, 0, 0., NULL, 0, 0., VLC_FALSE \ NULL, 0, 0., NULL, 0, 0., VLC_FALSE, VLC_FALSE \
}; \ }; \
STORE_SYMBOLS; \ STORE_SYMBOLS; \
p_module->b_submodule = VLC_FALSE; \ p_module->b_submodule = VLC_FALSE; \
......
...@@ -70,7 +70,7 @@ struct module_symbols_t ...@@ -70,7 +70,7 @@ struct module_symbols_t
void (*__config_ResetAll_inner) (vlc_object_t *); void (*__config_ResetAll_inner) (vlc_object_t *);
module_config_t * (*config_FindConfig_inner) (vlc_object_t *, const char *); module_config_t * (*config_FindConfig_inner) (vlc_object_t *, const char *);
module_t * (*config_FindModule_inner) (vlc_object_t *, const char *); module_t * (*config_FindModule_inner) (vlc_object_t *, const char *);
void (*config_Duplicate_inner) (module_t *, module_config_t *); void (*config_Duplicate_inner) (module_t *, const module_config_t *);
void (*config_SetCallbacks_inner) (module_config_t *, module_config_t *); void (*config_SetCallbacks_inner) (module_config_t *, module_config_t *);
void (*config_UnsetCallbacks_inner) (module_config_t *); void (*config_UnsetCallbacks_inner) (module_config_t *);
int (*__intf_Eject_inner) (vlc_object_t *, const char *); int (*__intf_Eject_inner) (vlc_object_t *, const char *);
......
...@@ -483,7 +483,7 @@ module_t *config_FindModule( vlc_object_t *p_this, const char *psz_name ) ...@@ -483,7 +483,7 @@ module_t *config_FindModule( vlc_object_t *p_this, const char *psz_name )
* this module might be unloaded from memory at any time (remember HideModule). * this module might be unloaded from memory at any time (remember HideModule).
* This is why we need to create an exact copy of the config data. * This is why we need to create an exact copy of the config data.
*****************************************************************************/ *****************************************************************************/
void config_Duplicate( module_t *p_module, module_config_t *p_orig ) void config_Duplicate( module_t *p_module, const module_config_t *p_orig )
{ {
int i, j, i_lines = 1; int i, j, i_lines = 1;
module_config_t *p_item; module_config_t *p_item;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment