svn commit: r1098793 - /subversion/trunk/subversion/libsvn_ra/ra_loader.c

[rhuijben]

Author: rhuijben
Date: Mon May  2 20:57:55 2011
New Revision: 1098793

URL: http://svn.apache.org/viewvc?rev=1098793&view=rev
Log:
* subversion/libsvn_ra/ra_loader.c
  (svn_ra_get_path_relative_to_session,
   svn_ra_get_path_relative_to_root): Partially revert r1096934, as
     svn_uri_is_child already guarantees uri decoded results.

Modified:
    subversion/trunk/subversion/libsvn_ra/ra_loader.c

Modified: subversion/trunk/subversion/libsvn_ra/ra_loader.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/ra_loader.c?rev=1098793&r1=1098792&r2=1098793&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/trunk/subversion/libsvn_ra/ra_loader.c Mon May  2 20:57:55 2011
@@ -577,13 +577,11 @@ svn_error_t *svn_ra_get_path_relative_to
     }
   else
     {
-      const char *relpath = svn_uri_is_child(sess_url, url, pool);
-      if (! *relpath)
+      *rel_path = svn_uri_is_child(sess_url, url, pool);
+      if (! *rel_path)
         return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
                                  _("'%s' isn't a child of session URL '%s'"),
                                  url, sess_url);
-
-      *rel_path = svn_path_uri_decode(relpath, pool);
     }
   return SVN_NO_ERROR;
 }
@@ -601,14 +599,12 @@ svn_error_t *svn_ra_get_path_relative_to
     }
   else
     {
-      const char *relpath = svn_uri_is_child(root_url, url, pool);
-      if (! *relpath)
+      *rel_path = svn_uri_is_child(root_url, url, pool);
+      if (! *rel_path)
         return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
                                  _("'%s' isn't a child of repository root "
                                    "URL '%s'"),
                                  url, root_url);
-
-      *rel_path = svn_path_uri_decode(relpath, pool);
     }
 
   return SVN_NO_ERROR;