luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-03 17:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename g_uri_get_scheme to g_uri_parse_scheme. Keep g_uri_get_scheme()

Browse Source 
2008-02-25  Alexander Larsson  <alexl@redhat.com>

        * glib/gurifuncs.[ch]:
        Rename g_uri_get_scheme to g_uri_parse_scheme.
	Keep g_uri_get_scheme() symbol for this
	unstable release to avoid breaking to many apps.



svn path=/trunk/; revision=6587
This commit is contained in:
Alexander Larsson 2008-02-25 13:28:44 +00:00 committed by Alexander Larsson
parent d8cd546812
commit 8f44427912
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-02-25 Alexander Larsson <alexl@redhat.com>
* glib/gurifuncs.[ch]:
Rename g_uri_get_scheme to g_uri_parse_scheme.
Keep g_uri_get_scheme() symbol for this
unstable release to avoid breaking to many apps.
2008-02-24 Tor Lillqvist <tml@novell.com> 2008-02-24 Tor Lillqvist <tml@novell.com>
* glib/gutils.c (_glib_get_installation_directory): New internal function. * glib/gutils.c (_glib_get_installation_directory): New internal function.

15
glib/gurifuncs.c
View File

@ -152,10 +152,10 @@ g_uri_unescape_string (const char *escaped_string,
} }
/** /**
* g_uri_get_scheme: * g_uri_parse_scheme:
* @uri: a valid URI. * @uri: a valid URI.
* *
* Gets the scheme portion of a URI. RFC 3986 decodes the scheme as: * Gets the scheme portion of a URI string. RFC 3986 decodes the scheme as:
* <programlisting> * <programlisting>
* URI = scheme ":" hier-part [ "?" query ] [ "#" fragment ] * URI = scheme ":" hier-part [ "?" query ] [ "#" fragment ]
* </programlisting> * </programlisting>
@ -167,7 +167,7 @@ g_uri_unescape_string (const char *escaped_string,
* Since: 2.16 * Since: 2.16
**/ **/
char * char *
g_uri_get_scheme (const char *uri) g_uri_parse_scheme (const char *uri)
{ {
const char *p; const char *p;
char c; char c;
@ -204,6 +204,15 @@ g_uri_get_scheme (const char *uri)
return g_strndup (uri, p - uri - 1); return g_strndup (uri, p - uri - 1);
} }
/* Temporary add a symbol to avoid crashing to many apps.
Remove after 2.15.6 release */
char * g_uri_get_scheme (const char *uri);
char *g_uri_get_scheme (const char *uri)
{
return g_uri_parse_scheme (uri);
}
/** /**
* g_uri_escape_string: * g_uri_escape_string:
* @unescaped: the unescaped input string. * @unescaped: the unescaped input string.

2
glib/gurifuncs.h
View File

@ -67,7 +67,7 @@ char * g_uri_unescape_string (const char *escaped_string,
char * g_uri_unescape_segment (const char *escaped_string, char * g_uri_unescape_segment (const char *escaped_string,
const char *escaped_string_end, const char *escaped_string_end,
const char *illegal_characters); const char *illegal_characters);
char * g_uri_get_scheme (const char *uri); char * g_uri_parse_scheme (const char *uri);
char * g_uri_escape_string (const char *unescaped, char * g_uri_escape_string (const char *unescaped,
const char *reserved_chars_allowed, const char *reserved_chars_allowed,
gboolean allow_utf8); gboolean allow_utf8);