You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ar...@apache.org on 2010/09/29 09:36:11 UTC

svn commit: r1002499 - /subversion/trunk/subversion/svnrdump/dump_editor.c

Author: artagnon
Date: Wed Sep 29 07:36:11 2010
New Revision: 1002499

URL: http://svn.apache.org/viewvc?rev=1002499&view=rev
Log:
svnrdump: dump_editor: Avoid allocating memory for extracting basename

* subversion/svnrdump/dump_editor.c

  (copen_directory, open_file): Since the call to svn_relpath_join
  allocates memory for the final path anyway, don't allocate memory
  after extracting the basename to join. From the svn_relpath_basename
  documentation, if pool is NULL, it simply returns a pointer to the
  string without allocating additional memory.

Modified:
    subversion/trunk/subversion/svnrdump/dump_editor.c

Modified: subversion/trunk/subversion/svnrdump/dump_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/dump_editor.c?rev=1002499&r1=1002498&r2=1002499&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/dump_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/dump_editor.c Wed Sep 29 07:36:11 2010
@@ -481,7 +481,7 @@ open_directory(const char *path,
   if (pb && ARE_VALID_COPY_ARGS(pb->copyfrom_path, pb->copyfrom_rev))
     {
       copyfrom_path = svn_uri_join(pb->copyfrom_path,
-                                   svn_relpath_basename(path, pool),
+                                   svn_relpath_basename(path, NULL),
                                    pool);
       copyfrom_rev = pb->copyfrom_rev;
     }
@@ -595,7 +595,8 @@ open_file(const char *path,
   if (pb && ARE_VALID_COPY_ARGS(pb->copyfrom_path, pb->copyfrom_rev))
     {
       copyfrom_path = svn_relpath_join(pb->copyfrom_path,
-                                       svn_relpath_basename(path, pool), pool);
+                                       svn_relpath_basename(path, NULL),
+                                       pool);
       copyfrom_rev = pb->copyfrom_rev;
     }