Author: rhuijben
Date: Tue Jan 29 11:46:42 2013
New Revision: 1439842
URL: http://svn.apache.org/viewvc?rev=1439842&view=rev
Log:
Move deprecated function to deprecated.c. Use public api instead of internal
api to obtain temp dir.
* subversion/libsvn_wc/adm_files.c
(svn_wc_create_tmp_file2): Move this function from here...
* subversion/libsvn_wc/deprecated.c
(svn_wc_create_tmp_file2): ... to here. Stop opening a raw
db handle.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_files.c
subversion/trunk/subversion/libsvn_wc/deprecated.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=1439842&r1=1439841&r2=1439842&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_files.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_files.c Tue Jan 29 11:46:42 2013
@@ -570,40 +570,6 @@ svn_wc__adm_cleanup_tmp_area(svn_wc__db_
}
-
-svn_error_t *
-svn_wc_create_tmp_file2(apr_file_t **fp,
- const char **new_name,
- const char *path,
- svn_io_file_del_t delete_when,
- apr_pool_t *pool)
-{
- svn_wc__db_t *db;
- const char *local_abspath;
- const char *temp_dir;
- svn_error_t *err;
-
- SVN_ERR_ASSERT(fp || new_name);
-
- SVN_ERR(svn_wc__db_open(&db,
- NULL /* config */,
- FALSE /* auto_upgrade */,
- TRUE /* enforce_empty_wq */,
- pool, pool));
-
- SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
- err = svn_wc__db_temp_wcroot_tempdir(&temp_dir, db, local_abspath,
- pool, pool);
- err = svn_error_compose_create(err, svn_wc__db_close(db));
- if (err)
- return svn_error_trace(err);
-
- SVN_ERR(svn_io_open_unique_file3(fp, new_name, temp_dir,
- delete_when, pool, pool));
-
- return SVN_NO_ERROR;
-}
-
svn_error_t *
svn_wc__get_tmpdir(const char **tmpdir_abspath,
svn_wc_context_t *wc_ctx,
Modified: subversion/trunk/subversion/libsvn_wc/deprecated.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/deprecated.c?rev=1439842&r1=1439841&r2=1439842&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_wc/deprecated.c Tue Jan 29 11:46:42 2013
@@ -607,6 +607,34 @@ svn_wc_create_tmp_file(apr_file_t **fp,
pool);
}
+svn_error_t *
+svn_wc_create_tmp_file2(apr_file_t **fp,
+ const char **new_name,
+ const char *path,
+ svn_io_file_del_t delete_when,
+ apr_pool_t *pool)
+{
+ svn_wc_context_t *wc_ctx;
+ const char *local_abspath;
+ const char *temp_dir;
+ svn_error_t *err;
+
+ SVN_ERR_ASSERT(fp || new_name);
+
+ SVN_ERR(svn_wc_context_create(&wc_ctx, NULL /* config */, pool, pool));
+
+ SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
+ err = svn_wc__get_tmpdir(&temp_dir, wc_ctx, local_abspath, pool, pool);
+ err = svn_error_compose_create(err, svn_wc_context_destroy(wc_ctx));
+ if (err)
+ return svn_error_trace(err);
+
+ SVN_ERR(svn_io_open_unique_file3(fp, new_name, temp_dir,
+ delete_when, pool, pool));
+
+ return SVN_NO_ERROR;
+}
+
/*** From adm_ops.c ***/
svn_error_t *
