X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_url.h;h=ef163d42cbda9062ce9144b4f853561af16076b1;hb=470ce70b69e1530173950a8dfd6d274a70caa7bc;hp=7cedd5b8b0156cbf9211d215b7ff4cd7b0637661;hpb=ebd800345f87349ff51971ae88c56cb439da4dcf;p=vlc diff --git a/include/vlc_url.h b/include/vlc_url.h index 7cedd5b8b0..ef163d42cb 100644 --- a/include/vlc_url.h +++ b/include/vlc_url.h @@ -45,11 +45,11 @@ struct vlc_url_t char *psz_buffer; /* to be freed */ }; -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 *, decode_URI, ( char *psz ) ); VLC_EXPORT( char *, encode_URI_component, ( const char *psz ) ); +VLC_EXPORT( char *, make_URI, ( const char *path, const char *scheme ) ); +VLC_EXPORT( char *, make_path, ( const char *url ) ); /***************************************************************************** * vlc_UrlParse: @@ -85,7 +85,6 @@ static inline void vlc_UrlParse( vlc_url_t *url, const char *psz_url, p = strstr( psz_parse, ":/" ); if( p != NULL ) { - char *p2; for( p2 = psz_parse; p2 < p; p2++ ) { #define I(i,a,b) ( (a) <= (i) && (i) <= (b) ) @@ -132,8 +131,6 @@ static inline void vlc_UrlParse( vlc_url_t *url, const char *psz_url, p = strchr( psz_parse, '/' ); if( !p || psz_parse < p ) { - char *p2; - /* We have a host[:port] */ url->psz_host = strdup( psz_parse ); if( p ) @@ -197,12 +194,6 @@ static inline void vlc_UrlClean( vlc_url_t *url ) url->psz_buffer = NULL; } -static inline char *vlc_UrlEncode( const char *psz_url ) -{ - /* FIXME: do not encode / : ? and & _when_ not needed */ - return encode_URI_component( psz_url ); -} - #include /** Check whether a given string is not a valid URL and must hence be