Commit 28c4cb74 authored by Pierre Ynard's avatar Pierre Ynard

Fix spelling: an URL -> a URL

U counts as a consonant when pronounced that way
parent f4cccde5
...@@ -110,7 +110,7 @@ VLC_EXPORT( httpd_url_t *, httpd_UrlNew, ( httpd_host_t *, const char *psz_url, ...@@ -110,7 +110,7 @@ VLC_EXPORT( httpd_url_t *, httpd_UrlNew, ( httpd_host_t *, const char *psz_url,
VLC_EXPORT( httpd_url_t *, httpd_UrlNewUnique, ( httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl ) LIBVLC_USED ); VLC_EXPORT( httpd_url_t *, httpd_UrlNewUnique, ( httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl ) LIBVLC_USED );
/* register callback on a url */ /* register callback on a url */
VLC_EXPORT( int, httpd_UrlCatch, ( httpd_url_t *, int i_msg, httpd_callback_t, httpd_callback_sys_t * ) ); VLC_EXPORT( int, httpd_UrlCatch, ( httpd_url_t *, int i_msg, httpd_callback_t, httpd_callback_sys_t * ) );
/* delete an url */ /* delete a url */
VLC_EXPORT( void, httpd_UrlDelete, ( httpd_url_t * ) ); VLC_EXPORT( void, httpd_UrlDelete, ( httpd_url_t * ) );
/* Default client mode is FILE, use these to change it */ /* Default client mode is FILE, use these to change it */
......
...@@ -181,7 +181,7 @@ VLC_EXPORT( stream_t *, stream_MemoryNew, (vlc_object_t *p_obj, uint8_t *p_buffe ...@@ -181,7 +181,7 @@ VLC_EXPORT( stream_t *, stream_MemoryNew, (vlc_object_t *p_obj, uint8_t *p_buffe
#define stream_MemoryNew( a, b, c, d ) stream_MemoryNew( VLC_OBJECT(a), b, c, d ) #define stream_MemoryNew( a, b, c, d ) stream_MemoryNew( VLC_OBJECT(a), b, c, d )
/** /**
* Create a stream_t reading from an URL. * Create a stream_t reading from a URL.
* You must delete it using stream_Delete. * You must delete it using stream_Delete.
*/ */
VLC_EXPORT( stream_t *, stream_UrlNew, (vlc_object_t *p_this, const char *psz_url ) ); VLC_EXPORT( stream_t *, stream_UrlNew, (vlc_object_t *p_this, const char *psz_url ) );
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
* File and directory functions * File and directory functions
****************************************************************************/ ****************************************************************************/
/* ToUrl: create a good name for an url from filename */ /* ToUrl: create a good name for a url from filename */
static char *FileToUrl( const char *name, bool *pb_index ) static char *FileToUrl( const char *name, bool *pb_index )
{ {
*pb_index = false; *pb_index = false;
......
...@@ -97,7 +97,7 @@ static bool ContainsURL( demux_t *p_demux ) ...@@ -97,7 +97,7 @@ static bool ContainsURL( demux_t *p_demux )
while( p_peek + sizeof( "https://" ) < p_peek_end ) while( p_peek + sizeof( "https://" ) < p_peek_end )
{ {
/* One line starting with an URL is enough */ /* One line starting with a URL is enough */
if( !strncasecmp( (const char *)p_peek, "http://", 7 ) || if( !strncasecmp( (const char *)p_peek, "http://", 7 ) ||
!strncasecmp( (const char *)p_peek, "mms://", 6 ) || !strncasecmp( (const char *)p_peek, "mms://", 6 ) ||
!strncasecmp( (const char *)p_peek, "rtsp://", 7 ) || !strncasecmp( (const char *)p_peek, "rtsp://", 7 ) ||
......
...@@ -103,7 +103,7 @@ bool OpenUrlDialog::shouldEnqueue() const ...@@ -103,7 +103,7 @@ bool OpenUrlDialog::shouldEnqueue() const
} }
/** Show Event: /** Show Event:
* When the dialog is shown, try to extract an URL from the clipboard * When the dialog is shown, try to extract a URL from the clipboard
* and paste it in the Edit box. * and paste it in the Edit box.
* showEvent can happen not only on exec() but I think it's cool to * showEvent can happen not only on exec() but I think it's cool to
* actualize the URL on showEvent (eg. change virtual desktop...) * actualize the URL on showEvent (eg. change virtual desktop...)
......
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
#define SDP_TEXT N_("SDP") #define SDP_TEXT N_("SDP")
#define SDP_LONGTEXT N_( \ #define SDP_LONGTEXT N_( \
"This allows you to specify how the SDP (Session Descriptor) for this RTP "\ "This allows you to specify how the SDP (Session Descriptor) for this RTP "\
"session will be made available. You must use an url: http://location to " \ "session will be made available. You must use a url: http://location to " \
"access the SDP via HTTP, rtsp://location for RTSP access, and sap:// " \ "access the SDP via HTTP, rtsp://location for RTSP access, and sap:// " \
"for the SDP to be announced via SAP." ) "for the SDP to be announced via SAP." )
#define SAP_TEXT N_("SAP announcing") #define SAP_TEXT N_("SAP announcing")
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
"that will be announced in the SDP (Session Descriptor)." ) "that will be announced in the SDP (Session Descriptor)." )
#define URL_TEXT N_("Session URL") #define URL_TEXT N_("Session URL")
#define URL_LONGTEXT N_( \ #define URL_LONGTEXT N_( \
"This allows you to give an URL with more details about the stream " \ "This allows you to give a URL with more details about the stream " \
"(often the website of the streaming organization), that will " \ "(often the website of the streaming organization), that will " \
"be announced in the SDP (Session Descriptor)." ) "be announced in the SDP (Session Descriptor)." )
#define EMAIL_TEXT N_("Session email") #define EMAIL_TEXT N_("Session email")
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
"that will be announced in the SDP (Session Descriptor)." ) "that will be announced in the SDP (Session Descriptor)." )
#define URL_TEXT N_("Session URL") #define URL_TEXT N_("Session URL")
#define URL_LONGTEXT N_( \ #define URL_LONGTEXT N_( \
"This allows you to give an URL with more details about the stream " \ "This allows you to give a URL with more details about the stream " \
"(often the website of the streaming organization), that will " \ "(often the website of the streaming organization), that will " \
"be announced in the SDP (Session Descriptor)." ) "be announced in the SDP (Session Descriptor)." )
#define EMAIL_TEXT N_("Session email") #define EMAIL_TEXT N_("Session email")
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
* * Z is the revision number * * Z is the revision number
* * e is an OPTIONAL extra letter * * e is an OPTIONAL extra letter
* * AKA "0.8.6d" or "0.9.0" * * AKA "0.8.6d" or "0.9.0"
* Second line is an url of the binary for this last version * Second line is a url of the binary for this last version
* Remaining text is a required description of the update * Remaining text is a required description of the update
*/ */
......
...@@ -1283,7 +1283,7 @@ int httpd_UrlCatch( httpd_url_t *url, int i_msg, httpd_callback_t cb, ...@@ -1283,7 +1283,7 @@ int httpd_UrlCatch( httpd_url_t *url, int i_msg, httpd_callback_t cb,
return VLC_SUCCESS; return VLC_SUCCESS;
} }
/* delete an url */ /* delete a url */
void httpd_UrlDelete( httpd_url_t *url ) void httpd_UrlDelete( httpd_url_t *url )
{ {
httpd_host_t *host = url->host; httpd_host_t *host = url->host;
......
...@@ -182,7 +182,7 @@ static int FindArt( playlist_fetcher_t *p_fetcher, input_item_t *p_item ) ...@@ -182,7 +182,7 @@ static int FindArt( playlist_fetcher_t *p_fetcher, input_item_t *p_item )
char *psz_arturl = input_item_GetArtURL( p_item ); char *psz_arturl = input_item_GetArtURL( p_item );
if( psz_arturl ) if( psz_arturl )
{ {
/* We already have an URL */ /* We already have a URL */
if( !strncmp( psz_arturl, "file://", strlen( "file://" ) ) ) if( !strncmp( psz_arturl, "file://", strlen( "file://" ) ) )
{ {
free( psz_arturl ); free( psz_arturl );
......
...@@ -147,10 +147,10 @@ static char *encode_URI_bytes (const char *psz_uri, size_t len) ...@@ -147,10 +147,10 @@ static char *encode_URI_bytes (const char *psz_uri, size_t len)
} }
/** /**
* Encodes an URI component (RFC3986 §2). * Encodes a URI component (RFC3986 §2).
* *
* @param psz_uri nul-terminated UTF-8 representation of the component. * @param psz_uri nul-terminated UTF-8 representation of the component.
* Obviously, you can't pass an URI containing a nul character, but you don't * Obviously, you can't pass a URI containing a nul character, but you don't
* want to do that, do you? * want to do that, do you?
* *
* @return encoded string (must be free()'d), or NULL for ENOMEM. * @return encoded string (must be free()'d), or NULL for ENOMEM.
...@@ -1031,8 +1031,8 @@ void path_sanitize( char *str ) ...@@ -1031,8 +1031,8 @@ void path_sanitize( char *str )
#endif #endif
/** /**
* Convert a file path to an URI. * Convert a file path to a URI.
* If already an URI, return a copy of the string. * If already a URI, return a copy of the string.
* @param path path to convert (or URI to copy) * @param path path to convert (or URI to copy)
* @param scheme URI scheme to use (default is auto: "file", "fd" or "smb") * @param scheme URI scheme to use (default is auto: "file", "fd" or "smb")
* @return a nul-terminated URI string (use free() to release it), * @return a nul-terminated URI string (use free() to release it),
...@@ -1045,7 +1045,7 @@ char *make_URI (const char *path, const char *scheme) ...@@ -1045,7 +1045,7 @@ char *make_URI (const char *path, const char *scheme)
if (scheme == NULL && !strcmp (path, "-")) if (scheme == NULL && !strcmp (path, "-"))
return strdup ("fd://0"); // standard input return strdup ("fd://0"); // standard input
if (strstr (path, "://") != NULL) if (strstr (path, "://") != NULL)
return strdup (path); /* Already an URI */ return strdup (path); /* Already a URI */
/* Note: VLC cannot handle URI schemes without double slash after the /* Note: VLC cannot handle URI schemes without double slash after the
* scheme name (such as mailto: or news:). */ * scheme name (such as mailto: or news:). */
...@@ -1145,7 +1145,7 @@ char *make_URI (const char *path, const char *scheme) ...@@ -1145,7 +1145,7 @@ char *make_URI (const char *path, const char *scheme)
} }
/** /**
* Tries to convert an URI to a local (UTF-8-encoded) file path. * Tries to convert a URI to a local (UTF-8-encoded) file path.
* @param url URI to convert * @param url URI to convert
* @return NULL on error, a nul-terminated string otherwise * @return NULL on error, a nul-terminated string otherwise
* (use free() to release it) * (use free() to release it)
......
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