subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1311847 - /subversion/trunk/subversion/libsvn_delta/compat.c
Date Tue, 10 Apr 2012 16:31:48 GMT
Author: hwright
Date: Tue Apr 10 16:31:48 2012
New Revision: 1311847

URL: http://svn.apache.org/viewvc?rev=1311847&view=rev
Log:
Use proper relpath manipulation functions, rather than apr_pstrcat().

* subversion/libsvn_delta/compat.c
  (ev2_add_directory, ev2_open_directory, ev2_open_file): As above.

Modified:
    subversion/trunk/subversion/libsvn_delta/compat.c

Modified: subversion/trunk/subversion/libsvn_delta/compat.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/compat.c?rev=1311847&r1=1311846&r2=1311847&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/compat.c (original)
+++ subversion/trunk/subversion/libsvn_delta/compat.c Tue Apr 10 16:31:48 2012
@@ -745,8 +745,8 @@ ev2_add_directory(const char *path,
       if (pb->copyfrom_path)
         {
           const char *name = svn_relpath_basename(relpath, scratch_pool);
-          cb->copyfrom_path = apr_pstrcat(result_pool, pb->copyfrom_path,
-                                          "/", name, NULL);
+          cb->copyfrom_path = svn_relpath_join(pb->copyfrom_path, name,
+                                               scratch_pool);
           cb->copyfrom_rev = pb->copyfrom_rev;
         }
     }
@@ -792,8 +792,8 @@ ev2_open_directory(const char *path,
       /* We are inside a copy. */
       const char *name = svn_relpath_basename(relpath, scratch_pool);
 
-      db->copyfrom_path = apr_pstrcat(result_pool, pb->copyfrom_path,
-                                      "/", name, NULL);
+      db->copyfrom_path = svn_relpath_join(pb->copyfrom_path, name,
+                                           scratch_pool);
       db->copyfrom_rev = pb->copyfrom_rev;
     }
 
@@ -916,8 +916,8 @@ ev2_open_file(const char *path,
       /* We're in a copied directory, so the delta base is going to be
          based up on the copy source. */
       const char *name = svn_relpath_basename(relpath, scratch_pool);
-      const char *copyfrom_path = apr_pstrcat(result_pool, pb->copyfrom_path,
-                                              "/", name, NULL);
+      const char *copyfrom_path = svn_relpath_join(pb->copyfrom_path, name,
+                                                   scratch_pool);
 
       SVN_ERR(fb->eb->fetch_base_func(&fb->delta_base,
                                       fb->eb->fetch_base_baton,



Mime
View raw message