You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/03/05 15:55:58 UTC
svn commit: r919436 - /subversion/trunk/subversion/libsvn_wc/adm_files.c
Author: philip
Date: Fri Mar 5 14:55:57 2010
New Revision: 919436
URL: http://svn.apache.org/viewvc?rev=919436&view=rev
Log:
* subversion/libsvn_wc/adm_files.c (open_adm_file): Remove unused function.
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=919436&r1=919435&r2=919436&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_files.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_files.c Fri Mar 5 14:55:57 2010
@@ -373,58 +373,6 @@
/*** Opening and closing files in the adm area. ***/
-/* Create and open a writable file in the admin temporary area of the WC
- directory DIR_ABSPATH, in a subdirectory named SUBDIR (such as "text-base"),
- with the name FNAME and extra EXTENSION (such as ".svn-base"). If the
- file already exists, first delete it. Set *STREAM to a writable stream
- to this file, and (if SELECTED_ABSPATH is not NULL) set *SELECTED_PATH to
- the path to this file, both allocated in RESULT_POOL.
-
- Closing the stream will close (but not delete) the file. */
-static svn_error_t *
-open_adm_file(svn_stream_t **stream,
- const char **selected_abspath,
- const char *dir_abspath,
- const char *subdir,
- const char *fname,
- const char *extension,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- svn_error_t *err;
-
- /* Extend with tmp name. */
- dir_abspath = extend_with_adm_name(dir_abspath, extension, TRUE, result_pool,
- subdir, fname, NULL);
- if (selected_abspath)
- *selected_abspath = dir_abspath; /* note: built in result_pool */
-
- err = svn_stream_open_writable(stream, dir_abspath, result_pool, scratch_pool);
- if (err && APR_STATUS_IS_EEXIST(err->apr_err))
- {
- /* Exclusive open failed, delete and retry */
- svn_error_clear(err);
- SVN_ERR(svn_io_remove_file2(dir_abspath, FALSE, scratch_pool));
- err = svn_stream_open_writable(stream, dir_abspath, result_pool, scratch_pool);
- }
-
- /* Examine the error from the first and/or second attempt at opening. */
- if (err && APR_STATUS_IS_ENOENT(err->apr_err))
- {
- /* If we receive a failure to open a file in our temporary directory,
- * it may be because our temporary directories aren't created.
- * Older SVN clients did not create these directories.
- * 'svn cleanup' will fix this problem.
- */
- err = svn_error_quick_wrap(err,
- _("Your .svn/tmp directory may be missing or "
- "corrupt; run 'svn cleanup' and try again"));
- }
-
- return svn_error_return(err);
-}
-
-
svn_error_t *
svn_wc__open_adm_stream(svn_stream_t **stream,
const char *dir_abspath,