Author: rhuijben
Date: Tue Jun 22 14:43:25 2010
New Revision: 956910
URL: http://svn.apache.org/viewvc?rev=956910&view=rev
Log:
Following up on r955721, remove temporary function that provides the same
information as the already available svn_wc_locked2() function.
* subversion/include/private/svn_wc_private.h
(svn_wc__temp_get_wclocked): Remove function.
* subversion/libsvn_client/status.c
(create_client_status): Update caller.
* subversion/libsvn_wc/node.c
(svn_wc__temp_get_wclocked): Remove function.
Suggested by: gstein
Modified:
subversion/trunk/subversion/include/private/svn_wc_private.h
subversion/trunk/subversion/libsvn_client/status.c
subversion/trunk/subversion/libsvn_wc/node.c
Modified: subversion/trunk/subversion/include/private/svn_wc_private.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_wc_private.h?rev=956910&r1=956909&r2=956910&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Tue Jun 22
14:43:25 2010
@@ -697,14 +697,6 @@ svn_wc__temp_get_keep_local(svn_boolean_
const char *local_abspath,
apr_pool_t *scratch_pool);
-/* Set *LOCKED to true when a lock for LOCAL_ABSPATH exists */
-svn_error_t *
-svn_wc__temp_get_wclocked(svn_boolean_t *locked,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *scratch_pool);
-
-
#ifdef __cplusplus
}
#endif /* __cplusplus */
Modified: subversion/trunk/subversion/libsvn_client/status.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/status.c?rev=956910&r1=956909&r2=956910&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/status.c (original)
+++ subversion/trunk/subversion/libsvn_client/status.c Tue Jun 22 14:43:25 2010
@@ -605,8 +605,8 @@ create_client_status(svn_client_status_t
(*cst)->switched = status->switched;
if (status->kind == svn_node_dir)
- SVN_ERR(svn_wc__temp_get_wclocked(&(*cst)->locked, wc_ctx, local_abspath,
- scratch_pool));
+ SVN_ERR(svn_wc_locked2(NULL, &(*cst)->locked, wc_ctx, local_abspath,
+ scratch_pool));
(*cst)->copied = status->copied;
(*cst)->revision = status->revision;
Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=956910&r1=956909&r2=956910&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Tue Jun 22 14:43:25 2010
@@ -1134,14 +1134,3 @@ svn_wc__temp_get_keep_local(svn_boolean_
return SVN_NO_ERROR;
}
-
-svn_error_t *
-svn_wc__temp_get_wclocked(svn_boolean_t *locked,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *scratch_pool)
-{
- return svn_error_return(
- svn_wc__db_wclocked(locked, wc_ctx->db, local_abspath,
- scratch_pool));
-}
