Commit 4484cb25 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

More warning fixes

parent cae4a7ff
......@@ -421,11 +421,11 @@ struct config_chain_t
};
#define config_ChainParse( a, b, c, d ) __config_ChainParse( VLC_OBJECT(a), b, c, d )
VLC_EXPORT( void, __config_ChainParse, ( vlc_object_t *, char *psz_prefix, const char **ppsz_options, config_chain_t * ) );
VLC_EXPORT( char *, config_ChainCreate, ( char **, config_chain_t **, char * ) );
VLC_EXPORT( void, __config_ChainParse, ( vlc_object_t *, const char *psz_prefix, const char **ppsz_options, config_chain_t * ) );
VLC_EXPORT( char *, config_ChainCreate, ( char **, config_chain_t **, const char * ) );
VLC_EXPORT( void, config_ChainDestroy, ( config_chain_t * ) );
static inline config_chain_t *config_chain_find( config_chain_t *p_cfg, char *psz_name )
static inline config_chain_t *config_chain_find( config_chain_t *p_cfg, const char *psz_name )
{
while( p_cfg && strcmp( p_cfg->psz_name, psz_name ) )
{
......@@ -435,7 +435,7 @@ static inline config_chain_t *config_chain_find( config_chain_t *p_cfg, char *ps
return p_cfg;
}
static inline char *config_chain_find_value( config_chain_t *p_cfg, char *psz_name )
static inline char *config_chain_find_value( config_chain_t *p_cfg, const char *psz_name )
{
while( p_cfg && strcmp( p_cfg->psz_name, psz_name ) )
{
......
......@@ -550,9 +550,9 @@ struct module_symbols_t
void *input_AskForArt_deprecated;
int (*playlist_AskForArtEnqueue_inner) (playlist_t *, input_item_t *);
uint32_t (*input_CurrentMetaFlags_inner) (vlc_meta_t *p_meta);
void (*__config_ChainParse_inner) (vlc_object_t *, char *psz_prefix, const char **ppsz_options, config_chain_t *);
void (*__config_ChainParse_inner) (vlc_object_t *, const char *psz_prefix, const char **ppsz_options, config_chain_t *);
void (*config_ChainDestroy_inner) (config_chain_t *);
char * (*config_ChainCreate_inner) (char **, config_chain_t **, char *);
char * (*config_ChainCreate_inner) (char **, config_chain_t **, const char *);
int (*utf8_open_inner) (const char *filename, int flags, mode_t mode);
int (*net_ListenSingle_inner) (vlc_object_t *p_this, const char *psz_host, int i_port, int family, int socktype, int protocol);
char * (*str_format_time_inner) (char *);
......
......@@ -45,9 +45,10 @@
{ while( e > p && ( *(e-1) == ' ' || *(e-1) == '\t' ) ) e--; }
/* go accross " " and { } */
static char *_get_chain_end( char *str )
static const char *_get_chain_end( const char *str )
{
char c, *p = str;
char c;
const char *p = str;
SKIPSPACE( p );
......@@ -76,10 +77,10 @@ static char *_get_chain_end( char *str )
}
}
char *config_ChainCreate( char **ppsz_name, config_chain_t **pp_cfg, char *psz_chain )
char *config_ChainCreate( char **ppsz_name, config_chain_t **pp_cfg, const char *psz_chain )
{
config_chain_t *p_cfg = NULL;
char *p = psz_chain;
const char *p = psz_chain;
*ppsz_name = NULL;
*pp_cfg = NULL;
......@@ -98,7 +99,7 @@ char *config_ChainCreate( char **ppsz_name, config_chain_t **pp_cfg, char *psz_c
if( *p == '{' )
{
char *psz_name;
const char *psz_name;
p++;
......@@ -126,7 +127,7 @@ char *config_ChainCreate( char **ppsz_name, config_chain_t **pp_cfg, char *psz_c
if( *p == '=' || *p == '{' )
{
char *end;
const char *end;
vlc_bool_t b_keep_brackets = (*p == '{');
if( *p == '=' ) p++;
......@@ -224,8 +225,8 @@ void config_ChainDestroy( config_chain_t *p_cfg )
}
}
void __config_ChainParse( vlc_object_t *p_this, char *psz_prefix,
const char **ppsz_options, config_chain_t *cfg )
void __config_ChainParse( vlc_object_t *p_this, const char *psz_prefix,
const char **ppsz_options, config_chain_t *cfg )
{
char *psz_name;
int i_type;
......
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