svn commit: r1060920 - in /subversion/branches/uris-as-urls/subversion/libsvn_subr: opt.c path.c subst.c

[cm...@apache.org]

Author: cmpilato
Date: Wed Jan 19 19:29:03 2011
New Revision: 1060920

URL: http://svn.apache.org/viewvc?rev=1060920&view=rev
Log:
On the 'uris-as-urls' branch, review and correct some use of the
svn_uri_* APIs.  (One step of many similar ones.)

* subversion/libsvn_subr/opt.c
  (svn_opt__arg_canonicalize_url): Review, correct (as needed), and
    rename uses of the svn_uri_* API.

* subversion/libsvn_subr/path.c
  (svn_path_get_longest_ancestor): (Same as above.)

* subversion/libsvn_subr/subst.c
  (keyword_printf): (Same as above.)

Modified:
    subversion/branches/uris-as-urls/subversion/libsvn_subr/opt.c
    subversion/branches/uris-as-urls/subversion/libsvn_subr/path.c
    subversion/branches/uris-as-urls/subversion/libsvn_subr/subst.c

Modified: subversion/branches/uris-as-urls/subversion/libsvn_subr/opt.c
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/libsvn_subr/opt.c?rev=1060920&r1=1060919&r2=1060920&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/libsvn_subr/opt.c (original)
+++ subversion/branches/uris-as-urls/subversion/libsvn_subr/opt.c Wed Jan 19 19:29:03 2011
@@ -997,7 +997,7 @@ svn_opt__arg_canonicalize_url(const char
                              target);
 
   /* Strip any trailing '/' and collapse other redundant elements. */
-  target = svn_uri_canonicalize(target, pool);
+  target = svn_url_canonicalize(target, pool);
 
   *url_out = target;
   return SVN_NO_ERROR;

Modified: subversion/branches/uris-as-urls/subversion/libsvn_subr/path.c
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/libsvn_subr/path.c?rev=1060920&r1=1060919&r2=1060920&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/libsvn_subr/path.c (original)
+++ subversion/branches/uris-as-urls/subversion/libsvn_subr/path.c Wed Jan 19 19:29:03 2011
@@ -498,7 +498,7 @@ svn_path_get_longest_ancestor(const char
      there's nothing common between them.  */
   if (path1_is_url && path2_is_url)
     {
-      return svn_uri_get_longest_ancestor(path1, path2, pool);
+      return svn_url_get_longest_ancestor(path1, path2, pool);
     }
   else if ((! path1_is_url) && (! path2_is_url))
     {

Modified: subversion/branches/uris-as-urls/subversion/libsvn_subr/subst.c
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/libsvn_subr/subst.c?rev=1060920&r1=1060919&r2=1060920&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/libsvn_subr/subst.c (original)
+++ subversion/branches/uris-as-urls/subversion/libsvn_subr/subst.c Wed Jan 19 19:29:03 2011
@@ -174,7 +174,7 @@ keyword_printf(const char *fmt,
           if (url)
             {
               const char *base_name
-                = svn_path_uri_decode(svn_uri_basename(url, pool), pool);
+                = svn_path_uri_decode(svn_url_basename(url, pool), pool);
               svn_stringbuf_appendcstr(value, base_name);
             }
           break;