You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/11/03 17:37:57 UTC
svn commit: r1030522 - /subversion/trunk/subversion/libsvn_wc/adm_files.c
Author: julianfoad
Date: Wed Nov 3 16:37:57 2010
New Revision: 1030522
URL: http://svn.apache.org/viewvc?rev=1030522&view=rev
Log:
* subversion/libsvn_wc/adm_files.c
(svn_wc_create_tmp_file2): Simplify: don't do what the callee can do.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_files.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_files.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_files.c?rev=1030522&r1=1030521&r2=1030522&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_files.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_files.c Wed Nov 3 16:37:57 2010
@@ -774,7 +774,6 @@ svn_wc_create_tmp_file2(apr_file_t **fp,
svn_wc__db_t *db;
const char *local_abspath;
const char *temp_dir;
- apr_file_t *file;
svn_error_t *err;
SVN_ERR_ASSERT(fp || new_name);
@@ -792,14 +791,9 @@ svn_wc_create_tmp_file2(apr_file_t **fp,
if (err)
return svn_error_return(err);
- SVN_ERR(svn_io_open_unique_file3(&file, new_name, temp_dir,
+ SVN_ERR(svn_io_open_unique_file3(fp, new_name, temp_dir,
delete_when, pool, pool));
- if (fp)
- *fp = file;
- else
- SVN_ERR(svn_io_file_close(file, pool));
-
return SVN_NO_ERROR;
}