From 299ef0c091af4c2102d80e8f7834ab91f015ff4a Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Thu, 6 Apr 2006 21:20:33 +0000 Subject: [PATCH] Oups --- include/vlc_symbols.h | 6 +++--- include/vlc_url.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/vlc_symbols.h b/include/vlc_symbols.h index c9dac0d99f..3e306030a5 100644 --- a/include/vlc_symbols.h +++ b/include/vlc_symbols.h @@ -490,7 +490,7 @@ struct module_symbols_t int (*utf8_scandir_inner) (const char *dirname, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** )); char * (*decode_URI_duplicate_inner) (const char *psz); void (*decode_URI_inner) (char *psz); - char * (*encode_URI_inner) (const char *psz); + char * (*encode_URI_component_inner) (const char *psz); }; # if defined (__PLUGIN__) # define aout_FiltersCreatePipeline (p_symbols)->aout_FiltersCreatePipeline_inner @@ -961,7 +961,7 @@ struct module_symbols_t # define utf8_scandir (p_symbols)->utf8_scandir_inner # define decode_URI_duplicate (p_symbols)->decode_URI_duplicate_inner # define decode_URI (p_symbols)->decode_URI_inner -# define encode_URI (p_symbols)->encode_URI_inner +# define encode_URI_component (p_symbols)->encode_URI_component_inner # elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__) /****************************************************************** * STORE_SYMBOLS: store VLC APIs into p_symbols for plugin access. @@ -1435,7 +1435,7 @@ struct module_symbols_t ((p_symbols)->utf8_scandir_inner) = utf8_scandir; \ ((p_symbols)->decode_URI_duplicate_inner) = decode_URI_duplicate; \ ((p_symbols)->decode_URI_inner) = decode_URI; \ - ((p_symbols)->encode_URI_inner) = encode_URI; \ + ((p_symbols)->encode_URI_component_inner) = encode_URI_component; \ (p_symbols)->net_ConvertIPv4_deprecated = NULL; \ (p_symbols)->__stats_CounterGet_deprecated = NULL; \ (p_symbols)->__stats_TimerDumpAll_deprecated = NULL; \ diff --git a/include/vlc_url.h b/include/vlc_url.h index e91c697f80..ab30180b74 100644 --- a/include/vlc_url.h +++ b/include/vlc_url.h @@ -173,12 +173,12 @@ VLC_EXPORT( char *, unescape_URI_duplicate, ( const char *psz ) ); VLC_EXPORT( void, unescape_URI, ( char *psz ) ); VLC_EXPORT( char *, decode_URI_duplicate, ( const char *psz ) ); VLC_EXPORT( void, decode_URI, ( char *psz ) ); -VLC_EXPORT( char *, encode_URI, ( const char *psz ) ); +VLC_EXPORT( char *, encode_URI_component, ( const char *psz ) ); static inline char *vlc_UrlEncode( const char *psz_url ) { /* FIXME: do not encode / : ? and & _when_ not needed */ - return encode_URI( psz_url ); + return encode_URI_component( psz_url ); } /***************************************************************************** -- 2.39.2