You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/04/18 19:27:14 UTC
svn commit: r1327588 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Author: stefan2
Date: Wed Apr 18 17:27:13 2012
New Revision: 1327588
URL: http://svn.apache.org/viewvc?rev=1327588&view=rev
Log:
Fix lock file name used for atomic mutexes.
* subversion/libsvn_fs_fs/fs_fs.c
(ATOMIC_REVPROP_GENERATION, ATOMIC_REVPROP_TIMEOUT,
ATOMIC_REVPROP_NAMESPACE): use '-' instead of CamelCase for structure
(ensure_revprop_namespace): properly construct the namespace path
Found by: philip
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=1327588&r1=1327587&r2=1327588&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Wed Apr 18 17:27:13 2012
@@ -99,9 +99,9 @@
/* The following are names of atomics that will be used to communicate
* revprop updates across all processes on this machine. */
-#define ATOMIC_REVPROP_GENERATION "RevPropGeneration"
-#define ATOMIC_REVPROP_TIMEOUT "RevPropTimeout"
-#define ATOMIC_REVPROP_NAMESPACE "RevPropAtomics"
+#define ATOMIC_REVPROP_GENERATION "rev-prop-generation"
+#define ATOMIC_REVPROP_TIMEOUT "rev-prop-timeout"
+#define ATOMIC_REVPROP_NAMESPACE "rev-prop-atomics"
/* Following are defines that specify the textual elements of the
native filesystem directories and revision files. */
@@ -2808,10 +2808,9 @@ ensure_revprop_namespace(svn_fs_t *fs)
return ffd->revprop_namespace == NULL
? svn_atomic_namespace__create(&ffd->revprop_namespace,
- apr_pstrcat(fs->pool,
- fs->path,
- ATOMIC_REVPROP_NAMESPACE,
- (char *)NULL),
+ svn_dirent_join(fs->path,
+ ATOMIC_REVPROP_NAMESPACE,
+ fs->pool),
fs->pool)
: SVN_NO_ERROR;
}