svn commit: r1658032 - /subversion/trunk/subversion/libsvn_fs_x/hotcopy.c

[stefan2]

Author: stefan2
Date: Sat Feb  7 07:48:14 2015
New Revision: 1658032

URL: http://svn.apache.org/r1658032
Log:
* subversion/libsvn_fs_x/hotcopy.c
  (entry_name_to_utf8): It is perfectly acceptable to use a RESULT_POOL
                        for the construction of an error object.  Hence
                        there is no need for a separate SCRATCH_POOL.

Modified:
    subversion/trunk/subversion/libsvn_fs_x/hotcopy.c

Modified: subversion/trunk/subversion/libsvn_fs_x/hotcopy.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/hotcopy.c?rev=1658032&r1=1658031&r2=1658032&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/hotcopy.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/hotcopy.c Sat Feb  7 07:48:14 2015
@@ -99,15 +99,15 @@ static svn_error_t *
 entry_name_to_utf8(const char **name_p,
                    const char *name,
                    const char *parent,
-                   apr_pool_t *pool)
+                   apr_pool_t *result_pool)
 {
-  svn_error_t *err = svn_path_cstring_to_utf8(name_p, name, pool);
+  svn_error_t *err = svn_path_cstring_to_utf8(name_p, name, result_pool);
   if (err && err->apr_err == APR_EINVAL)
     {
       return svn_error_createf(err->apr_err, err,
                                _("Error converting entry "
                                  "in directory '%s' to UTF-8"),
-                               svn_dirent_local_style(parent, pool));
+                               svn_dirent_local_style(parent, result_pool));
     }
   return err;
 }