You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2013/06/18 23:24:41 UTC
svn commit: r1494314 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Author: ivan
Date: Tue Jun 18 21:24:41 2013
New Revision: 1494314
URL: http://svn.apache.org/r1494314
Log:
Convert repository path to local style when logging FSFS revprop cache
initialization error.
* subversion/libsvn_fs_fs/fs_fs.c
(log_revprop_cache_init_warning): Add POOL. Convert fs->path to local
style.
(has_revprop_cache): Pass POOL to log_revprop_cache_init_warning() call.
Modified:
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1494314&r1=1494313&r2=1494314&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Tue Jun 18 21:24:41 2013
@@ -3290,11 +3290,13 @@ ensure_revprop_timeout(svn_fs_t *fs)
static void
log_revprop_cache_init_warning(svn_fs_t *fs,
svn_error_t *underlying_err,
- const char *message)
+ const char *message,
+ apr_pool_t *pool)
{
- svn_error_t *err = svn_error_createf(SVN_ERR_FS_REVPROP_CACHE_INIT_FAILURE,
- underlying_err,
- message, fs->path);
+ svn_error_t *err = svn_error_createf(
+ SVN_ERR_FS_REVPROP_CACHE_INIT_FAILURE,
+ underlying_err, message,
+ svn_dirent_local_style(fs->path, pool));
if (fs->warning)
(fs->warning)(fs->warning_baton, err);
@@ -3323,7 +3325,8 @@ has_revprop_cache(svn_fs_t *fs, apr_pool
ffd->revprop_cache = NULL;
log_revprop_cache_init_warning(fs, NULL,
"Revprop caching for '%s' disabled"
- " because it would be inefficient.");
+ " because it would be inefficient.",
+ pool);
return FALSE;
}
@@ -3338,7 +3341,8 @@ has_revprop_cache(svn_fs_t *fs, apr_pool
log_revprop_cache_init_warning(fs, error,
"Revprop caching for '%s' disabled "
"because SHM infrastructure for revprop "
- "caching failed to initialize.");
+ "caching failed to initialize.",
+ pool);
return FALSE;
}