Hi All,
Find the attached patch and log.
With regards
Kamesh Jayachandran
[[[
Patch by: Kamesh Jayachandran <kamesh@collab.net>
Use '__' to separate the function name from libprefix for library private
functions.
* subversion/include/private/svn_atomic.h
* subversion/libsvn_subr/atomic.c
(svn_atomic__init_once): Rename from svn_atomic_init_once.
* subversion/libsvn_fs_base/bdb/env.c
(svn_fs_bdb__init): Adjust for above rename.
* subversion/libsvn_ra_svn/sasl_auth.c
(global): Fix comment to adjust for above rename.
(svn_ra_svn__sasl_init): Adjust for above rename.
* subversion/svnserve/sasl_auth.c
(sasl_init): Adjust for above rename.
]]]
Index: subversion/include/private/svn_atomic.h
===================================================================
--- subversion/include/private/svn_atomic.h (revision 21653)
+++ subversion/include/private/svn_atomic.h (working copy)
@@ -105,8 +105,8 @@
* @since New in 1.5.
*/
svn_error_t *
-svn_atomic_init_once(volatile svn_atomic_t *global_status,
- svn_error_t *(*init_func)(void));
+svn_atomic__init_once(volatile svn_atomic_t *global_status,
+ svn_error_t *(*init_func)(void));
#ifdef __cplusplus
}
Index: subversion/libsvn_subr/atomic.c
===================================================================
--- subversion/libsvn_subr/atomic.c (revision 21653)
+++ subversion/libsvn_subr/atomic.c (working copy)
@@ -25,8 +25,8 @@
#define SVN_ATOMIC_INITIALIZED 3
svn_error_t*
-svn_atomic_init_once(volatile svn_atomic_t *global_status,
- svn_error_t *(*init_func)(void))
+svn_atomic__init_once(volatile svn_atomic_t *global_status,
+ svn_error_t *(*init_func)(void))
{
/* We have to call init_func exactly once. Because APR
doesn't have statically-initialized mutexes, we implement a poor
Index: subversion/libsvn_fs_base/bdb/env.c
===================================================================
--- subversion/libsvn_fs_base/bdb/env.c (revision 21653)
+++ subversion/libsvn_fs_base/bdb/env.c (working copy)
@@ -382,7 +382,7 @@
svn_error_t *
svn_fs_bdb__init(void)
{
- SVN_ERR(svn_atomic_init_once(&bdb_cache_state, bdb_init_cb));
+ SVN_ERR(svn_atomic__init_once(&bdb_cache_state, bdb_init_cb));
return SVN_NO_ERROR;
}
Index: subversion/libsvn_ra_svn/sasl_auth.c
===================================================================
--- subversion/libsvn_ra_svn/sasl_auth.c (revision 21653)
+++ subversion/libsvn_ra_svn/sasl_auth.c (working copy)
@@ -40,7 +40,7 @@
#include "ra_svn.h"
-/* Note: In addition to being used via svn_atomic_init_once to control
+/* Note: In addition to being used via svn_atomic__init_once to control
* initialization of the SASL code this will also be referenced in
* the various functions that work with sasl mutexes to determine
* if the sasl pool has been destroyed. This should be safe, since
@@ -182,7 +182,7 @@
svn_error_t *svn_ra_svn__sasl_init(void)
{
- SVN_ERR(svn_atomic_init_once(&svn_ra_svn__sasl_status, sasl_init_cb));
+ SVN_ERR(svn_atomic__init_once(&svn_ra_svn__sasl_status, sasl_init_cb));
return SVN_NO_ERROR;
}
Index: subversion/svnserve/sasl_auth.c
===================================================================
--- subversion/svnserve/sasl_auth.c (revision 21653)
+++ subversion/svnserve/sasl_auth.c (working copy)
@@ -118,7 +118,7 @@
svn_error_t *sasl_init(void)
{
- SVN_ERR(svn_atomic_init_once(&svn_ra_svn__sasl_status, initialize));
+ SVN_ERR(svn_atomic__init_once(&svn_ra_svn__sasl_status, initialize));
return SVN_NO_ERROR;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Sep 26 14:10:59 2006