You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2011/01/18 17:15:27 UTC
svn commit: r1060442 - in /subversion/branches/uris-as-urls/subversion:
include/svn_dirent_uri.h libsvn_subr/dirent_uri.c
Author: cmpilato
Date: Tue Jan 18 16:15:26 2011
New Revision: 1060442
URL: http://svn.apache.org/viewvc?rev=1060442&view=rev
Log:
On the 'uris-as-urls', rename all the svn_uri_* functions to
svn_url_*. This is not a permanent change, and breaks the build of
this branch *completely*, but will (in concert with my trusty
compiler) serve as a check-off list of codepoints which need review.
* subversion/include/svn_dirent_uri.h,
* subversion/libsvn_subr/dirent_uri.c
(svn_url_basename, svn_url_canonicalize, svn_url_condense_targets,
svn_url_dirname, svn_url_get_dirent_from_file_url,
svn_url_get_file_url_from_dirent, svn_url_get_longest_ancestor,
svn_url_is_absolute, svn_url_is_ancestor, svn_url_is_canonical,
svn_url_is_child, svn_url_is_root, svn_url_join,
svn_url_skip_ancestor, svn_url_split): Renamed from svn_uri_*.
Modified:
subversion/branches/uris-as-urls/subversion/include/svn_dirent_uri.h
subversion/branches/uris-as-urls/subversion/libsvn_subr/dirent_uri.c
Modified: subversion/branches/uris-as-urls/subversion/include/svn_dirent_uri.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/include/svn_dirent_uri.h?rev=1060442&r1=1060441&r2=1060442&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/include/svn_dirent_uri.h (original)
+++ subversion/branches/uris-as-urls/subversion/include/svn_dirent_uri.h Tue Jan 18 16:15:26 2011
@@ -213,7 +213,7 @@ svn_relpath_join(const char *base,
* @since New in 1.7.
*/
char *
-svn_uri_join(const char *base,
+svn_url_join(const char *base,
const char *component,
apr_pool_t *pool);
@@ -356,7 +356,7 @@ svn_relpath_dirname(const char *relpath,
* @since New in 1.7.
*/
void
-svn_uri_split(const char **dirpath,
+svn_url_split(const char **dirpath,
const char **base_name,
const char *uri,
apr_pool_t *pool);
@@ -376,7 +376,7 @@ svn_uri_split(const char **dirpath,
* @since New in 1.7.
*/
const char *
-svn_uri_basename(const char *uri,
+svn_url_basename(const char *uri,
apr_pool_t *pool);
/** Get the dirname of the specified canonicalized @a uri, defined as
@@ -390,7 +390,7 @@ svn_uri_basename(const char *uri,
* @since New in 1.7.
*/
char *
-svn_uri_dirname(const char *uri,
+svn_url_dirname(const char *uri,
apr_pool_t *pool);
@@ -408,7 +408,7 @@ svn_dirent_is_absolute(const char *diren
* @since New in 1.7.
*/
svn_boolean_t
-svn_uri_is_absolute(const char *uri);
+svn_url_is_absolute(const char *uri);
/** Return TRUE if @a dirent is considered a root directory on the platform
* at hand.
@@ -432,7 +432,7 @@ svn_dirent_is_root(const char *dirent,
* @since New in 1.7
*/
svn_boolean_t
-svn_uri_is_root(const char *uri,
+svn_url_is_root(const char *uri,
apr_size_t len);
/** Return a new dirent like @a dirent, but transformed such that some types
@@ -495,7 +495,7 @@ svn_relpath_canonicalize(const char *rel
* @since New in 1.7.
*/
const char *
-svn_uri_canonicalize(const char *uri,
+svn_url_canonicalize(const char *uri,
apr_pool_t *pool);
/** Return @c TRUE iff @a dirent is canonical. Use @a pool for temporary
@@ -526,7 +526,7 @@ svn_relpath_is_canonical(const char *rel
* @since New in 1.7.
*/
svn_boolean_t
-svn_uri_is_canonical(const char *uri,
+svn_url_is_canonical(const char *uri,
apr_pool_t *pool);
/** Return the longest common dirent shared by two canonicalized dirents,
@@ -564,7 +564,7 @@ svn_relpath_get_longest_ancestor(const c
* @since New in 1.7.
*/
char *
-svn_uri_get_longest_ancestor(const char *uri1,
+svn_url_get_longest_ancestor(const char *uri1,
const char *uri2,
apr_pool_t *pool);
@@ -602,7 +602,7 @@ svn_dirent_get_absolute(const char **pab
* @since New in 1.7.
*/
const char *
-svn_uri_is_child(const char *parent_uri,
+svn_url_is_child(const char *parent_uri,
const char *child_uri,
apr_pool_t *pool);
@@ -659,7 +659,7 @@ svn_relpath_is_ancestor(const char *pare
* @since New in 1.7.
*/
svn_boolean_t
-svn_uri_is_ancestor(const char *parent_uri,
+svn_url_is_ancestor(const char *parent_uri,
const char *child_uri);
@@ -706,7 +706,7 @@ svn_relpath_skip_ancestor(const char *pa
* @since New in 1.7.
*/
const char *
-svn_uri_skip_ancestor(const char *parent_uri,
+svn_url_skip_ancestor(const char *parent_uri,
const char *child_uri);
/** Find the common prefix of the canonicalized dirents in @a targets
@@ -784,7 +784,7 @@ svn_dirent_condense_targets(const char *
* @since New in 1.7.
*/
svn_error_t *
-svn_uri_condense_targets(const char **pcommon,
+svn_url_condense_targets(const char **pcommon,
apr_array_header_t **pcondensed_targets,
const apr_array_header_t *targets,
svn_boolean_t remove_redundancies,
@@ -815,7 +815,7 @@ svn_dirent_is_under_root(svn_boolean_t *
* @since New in 1.7.
*/
svn_error_t *
-svn_uri_get_dirent_from_file_url(const char **dirent,
+svn_url_get_dirent_from_file_url(const char **dirent,
const char *url,
apr_pool_t *pool);
@@ -825,7 +825,7 @@ svn_uri_get_dirent_from_file_url(const c
* @since New in 1.7.
*/
svn_error_t *
-svn_uri_get_file_url_from_dirent(const char **url,
+svn_url_get_file_url_from_dirent(const char **url,
const char *dirent,
apr_pool_t *pool);
Modified: subversion/branches/uris-as-urls/subversion/libsvn_subr/dirent_uri.c
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/libsvn_subr/dirent_uri.c?rev=1060442&r1=1060441&r2=1060442&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/libsvn_subr/dirent_uri.c (original)
+++ subversion/branches/uris-as-urls/subversion/libsvn_subr/dirent_uri.c Tue Jan 18 16:15:26 2011
@@ -968,7 +968,7 @@ svn_dirent_is_root(const char *dirent, a
}
svn_boolean_t
-svn_uri_is_root(const char *uri, apr_size_t len)
+svn_url_is_root(const char *uri, apr_size_t len)
{
/* directory is root if it's equal to '/' */
if (len == 1 && uri[0] == '/')
@@ -1213,7 +1213,7 @@ svn_relpath_join(const char *base,
}
char *
-svn_uri_join(const char *base, const char *component, apr_pool_t *pool)
+svn_url_join(const char *base, const char *component, apr_pool_t *pool)
{
apr_size_t blen = strlen(base);
apr_size_t clen = strlen(component);
@@ -1363,7 +1363,7 @@ svn_relpath_split(const char **dirpath,
}
char *
-svn_uri_dirname(const char *uri, apr_pool_t *pool)
+svn_url_dirname(const char *uri, apr_pool_t *pool)
{
apr_size_t len = strlen(uri);
@@ -1376,7 +1376,7 @@ svn_uri_dirname(const char *uri, apr_poo
}
const char *
-svn_uri_basename(const char *uri, apr_pool_t *pool)
+svn_url_basename(const char *uri, apr_pool_t *pool)
{
apr_size_t len = strlen(uri);
apr_size_t start;
@@ -1399,7 +1399,7 @@ svn_uri_basename(const char *uri, apr_po
}
void
-svn_uri_split(const char **dirpath,
+svn_url_split(const char **dirpath,
const char **base_name,
const char *uri,
apr_pool_t *pool)
@@ -1437,7 +1437,7 @@ svn_relpath_get_longest_ancestor(const c
}
char *
-svn_uri_get_longest_ancestor(const char *uri1,
+svn_url_get_longest_ancestor(const char *uri1,
const char *uri2,
apr_pool_t *pool)
{
@@ -1513,7 +1513,7 @@ svn_relpath_is_child(const char *parent_
}
const char *
-svn_uri_is_child(const char *parent_uri,
+svn_url_is_child(const char *parent_uri,
const char *child_uri,
apr_pool_t *pool)
{
@@ -1536,7 +1536,7 @@ svn_relpath_is_ancestor(const char *pare
}
svn_boolean_t
-svn_uri_is_ancestor(const char *parent_uri, const char *child_uri)
+svn_url_is_ancestor(const char *parent_uri, const char *child_uri)
{
return is_ancestor(type_uri, parent_uri, child_uri);
}
@@ -1595,7 +1595,7 @@ svn_relpath_skip_ancestor(const char *pa
const char *
-svn_uri_skip_ancestor(const char *parent_uri,
+svn_url_skip_ancestor(const char *parent_uri,
const char *child_uri)
{
apr_size_t len = strlen(parent_uri);
@@ -1642,7 +1642,7 @@ svn_dirent_is_absolute(const char *diren
}
svn_boolean_t
-svn_uri_is_absolute(const char *uri)
+svn_url_is_absolute(const char *uri)
{
/* uri is absolute if it starts with '/' */
if (uri && uri[0] == '/')
@@ -1682,7 +1682,7 @@ svn_dirent_get_absolute(const char **pab
}
const char *
-svn_uri_canonicalize(const char *uri, apr_pool_t *pool)
+svn_url_canonicalize(const char *uri, apr_pool_t *pool)
{
return canonicalize(type_uri, uri, pool);
}
@@ -1808,7 +1808,7 @@ svn_relpath_is_canonical(const char *rel
}
svn_boolean_t
-svn_uri_is_canonical(const char *uri, apr_pool_t *pool)
+svn_url_is_canonical(const char *uri, apr_pool_t *pool)
{
const char *ptr = uri, *seg = uri;
const char *schema_data = NULL;
@@ -2119,7 +2119,7 @@ svn_dirent_condense_targets(const char *
}
svn_error_t *
-svn_uri_condense_targets(const char **pcommon,
+svn_url_condense_targets(const char **pcommon,
apr_array_header_t **pcondensed_targets,
const apr_array_header_t *targets,
svn_boolean_t remove_redundancies,
@@ -2325,7 +2325,7 @@ svn_dirent_is_under_root(svn_boolean_t *
}
svn_error_t *
-svn_uri_get_dirent_from_file_url(const char **dirent,
+svn_url_get_dirent_from_file_url(const char **dirent,
const char *url,
apr_pool_t *pool)
{
@@ -2441,7 +2441,7 @@ svn_uri_get_dirent_from_file_url(const c
}
svn_error_t *
-svn_uri_get_file_url_from_dirent(const char **url,
+svn_url_get_file_url_from_dirent(const char **url,
const char *dirent,
apr_pool_t *pool)
{