You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2010/05/15 03:33:45 UTC
svn commit: r944544 - /subversion/trunk/subversion/libsvn_subr/io.c
Author: rhuijben
Date: Sat May 15 01:33:44 2010
New Revision: 944544
URL: http://svn.apache.org/viewvc?rev=944544&view=rev
Log:
* subversion/libsvn_subr/io.c
(file_mktemp): Following up on r944540, fix the unix build by
reintroducing the templ variable.
Modified:
subversion/trunk/subversion/libsvn_subr/io.c
Modified: subversion/trunk/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/io.c?rev=944544&r1=944543&r2=944544&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/io.c (original)
+++ subversion/trunk/subversion/libsvn_subr/io.c Sat May 15 01:33:44 2010
@@ -3539,13 +3539,11 @@ file_mktemp(apr_file_t **new_file, const
apr_int32_t flags, apr_pool_t *pool)
{
#ifndef WIN32
+ const char *templ = svn_dirent_join(directory, "svn-XXXXXX", pool);
const char *templ_apr;
apr_status_t status;
- SVN_ERR(svn_path_cstring_from_utf8(&templ_apr,
- svn_dirent_join(dirpath, "svn-XXXXXX",
- scratch_pool),
- pool));
+ SVN_ERR(svn_path_cstring_from_utf8(&templ_apr, templ, pool));
/* ### svn_path_cstring_from_utf8() guarantees to make a copy of the
data available in POOL and we need a non-const pointer here,