svn commit: r1067199 - in /subversion/trunk/subversion: include/private/svn_fspath.h libsvn_subr/dirent_uri.c mod_dav_svn/mod_dav_svn.c

[cm...@apache.org]

Author: cmpilato
Date: Fri Feb  4 15:37:34 2011
New Revision: 1067199

URL: http://svn.apache.org/viewvc?rev=1067199&view=rev
Log:
Fix some Windows test failures caused by introducing the use of the
wrong path API in r1067180.

(The idea of internalizing a urlpath seemed super-weird to me when I
added the svn_urlpath__internal_style() function in that revision.
Had I dug into that instinct a bit more, I would have realized why:
it's just plain wrong!)

* subversion/include/private/svn_fspath.h,
* subversion/libsvn_subr/dirent_uri.c
  (svn_urlpath__internal_style): Removed.

* subversion/mod_dav_svn/mod_dav_svn.c
  (SVNPath_cmd, SVNParentPath_cmd): Use svn_dirent_internal_style(),
    not svn_urlpath__internal_style().  That was ... just ... silly.

Modified:
    subversion/trunk/subversion/include/private/svn_fspath.h
    subversion/trunk/subversion/libsvn_subr/dirent_uri.c
    subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c

Modified: subversion/trunk/subversion/include/private/svn_fspath.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_fspath.h?rev=1067199&r1=1067198&r2=1067199&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_fspath.h (original)
+++ subversion/trunk/subversion/include/private/svn_fspath.h Fri Feb  4 15:37:34 2011
@@ -194,10 +194,6 @@ svn_fspath__get_longest_ancestor(const c
 const char *
 svn_urlpath__canonicalize(const char *uri, apr_pool_t *pool);
 
-/* Like svn_relpath_internal_style(), but for urlpaths. */
-const char *
-svn_urlpath__internal_style(const char *uri, apr_pool_t *pool);
-
 
 #ifdef __cplusplus
 }

Modified: subversion/trunk/subversion/libsvn_subr/dirent_uri.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/dirent_uri.c?rev=1067199&r1=1067198&r2=1067199&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/dirent_uri.c (original)
+++ subversion/trunk/subversion/libsvn_subr/dirent_uri.c Fri Feb  4 15:37:34 2011
@@ -2589,14 +2589,3 @@ svn_urlpath__canonicalize(const char *ur
     }
   return uri;
 }
-
-const char *
-svn_urlpath__internal_style(const char *uri,
-                            apr_pool_t *pool)
-{
-  return svn_urlpath__canonicalize(
-             svn_relpath_internal_style(
-                 svn_relpath_canonicalize(uri + 1, pool),
-                 pool),
-             pool);
-}

Modified: subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c?rev=1067199&r1=1067198&r2=1067199&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c Fri Feb  4 15:37:34 2011
@@ -368,7 +368,7 @@ SVNPath_cmd(cmd_parms *cmd, void *config
   if (conf->fs_parent_path != NULL)
     return "SVNPath cannot be defined at same time as SVNParentPath.";
 
-  conf->fs_path = svn_urlpath__internal_style(arg1, cmd->pool);
+  conf->fs_path = svn_dirent_internal_style(arg1, cmd->pool);
 
   return NULL;
 }
@@ -382,7 +382,7 @@ SVNParentPath_cmd(cmd_parms *cmd, void *
   if (conf->fs_path != NULL)
     return "SVNParentPath cannot be defined at same time as SVNPath.";
 
-  conf->fs_parent_path = svn_urlpath__internal_style(arg1, cmd->pool);
+  conf->fs_parent_path = svn_dirent_internal_style(arg1, cmd->pool);
 
   return NULL;
 }