Use var_Inherit* instead of var_CreateGet*.

[vlc] / include / vlc_url.h

diff --git a/include/vlc_url.h b/include/vlc_url.h
index 4e95c7d7d83bbdf8e11546b0328134601d5092fb..ef163d42cbda9062ce9144b4f853561af16076b1 100644 (file)
--- a/include/vlc_url.h
+++ b/include/vlc_url.h
@@ -25,6 +25,11 @@
 #ifndef VLC_URL_H
 # define VLC_URL_H
 
+/**
+ * \file
+ * This file defines functions for manipulating URL in vlc
+ */
+
 struct vlc_url_t
 {
     char *psz_protocol;
@@ -40,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:
@@ -80,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) )
@@ -127,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 )
@@ -192,13 +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 <ctype.h>
 
 /** Check whether a given string is not a valid URL and must hence be
@@ -227,5 +222,4 @@ static inline int vlc_UrlIsNotEncoded( const char *psz_url )
     return 0; /* looks fine - but maybe it is not encoded */
 }
 
-
 #endif