Author: rhuijben
Date: Fri Apr 15 08:35:20 2011
New Revision: 1092629
URL: http://svn.apache.org/viewvc?rev=1092629&view=rev
Log:
* subversion/libsvn_wc/update_editor.c
(get_empty_tmp_file): Avoid doing work that another function can do for us.
Modified:
subversion/trunk/subversion/libsvn_wc/update_editor.c
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1092629&r1=1092628&r2=1092629&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Fri Apr 15 08:35:20
2011
@@ -424,18 +424,15 @@ get_empty_tmp_file(const char **tmp_file
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- const char *temp_dir_path;
- apr_file_t *file;
+ const char *temp_dir_abspath;
- SVN_ERR(svn_wc__db_temp_wcroot_tempdir(&temp_dir_path, db, wri_abspath,
+ SVN_ERR(svn_wc__db_temp_wcroot_tempdir(&temp_dir_abspath, db, wri_abspath,
scratch_pool, scratch_pool));
- SVN_ERR(svn_io_open_unique_file3(&file, tmp_filename, temp_dir_path,
+ SVN_ERR(svn_io_open_unique_file3(NULL, tmp_filename, temp_dir_abspath,
svn_io_file_del_none,
scratch_pool, scratch_pool));
- SVN_ERR(svn_io_file_close(file, scratch_pool));
- return svn_error_return(svn_dirent_get_absolute(tmp_filename, *tmp_filename,
- result_pool));
+ return SVN_NO_ERROR;
}
/* An APR pool cleanup handler. This runs the log file for a
