svn_wc_locked2() should just be removed. We never use it, and
(conceptually) it won't apply to wc-ng.
(note that svn_wc_locked() is used by tests/cmdline/entries-dump.c, though)
Cheers,
-g
On Fri, Oct 16, 2009 at 17:34, Hyrum K. Wright <hyrum_at_hyrumwright.org> wrote:
> Author: hwright
> Date: Fri Oct 16 14:34:44 2009
> New Revision: 40084
>
> Log:
> Remove another now-unused internal function, folding it into the public version.
>
> * subversion/libsvn_wc/wc.h
> (svn_wc__internal_locked): Remove.
>
> * subversion/libsvn_wc/lock.c
> (svn_wc__internal_locked): Remove, and combine with...
> (svn_wc_locked2): ...this.
>
> Modified:
> trunk/subversion/libsvn_wc/lock.c
> trunk/subversion/libsvn_wc/wc.h
>
> Modified: trunk/subversion/libsvn_wc/lock.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/lock.c?pathrev=40084&r1=40083&r2=40084
> ==============================================================================
> --- trunk/subversion/libsvn_wc/lock.c Fri Oct 16 14:28:15 2009 (r40083)
> +++ trunk/subversion/libsvn_wc/lock.c Fri Oct 16 14:34:44 2009 (r40084)
> @@ -1396,28 +1396,29 @@ svn_wc__adm_write_check(const svn_wc_adm
> }
>
> svn_error_t *
> -svn_wc__internal_locked(svn_boolean_t *locked_here,
> - svn_boolean_t *locked,
> - svn_wc__db_t *db,
> - const char *local_abspath,
> - apr_pool_t *scratch_pool)
> +svn_wc_locked2(svn_boolean_t *locked_here,
> + svn_boolean_t *locked,
> + svn_wc_context_t *wc_ctx,
> + const char *local_abspath,
> + apr_pool_t *scratch_pool)
> {
> SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
>
> if (locked_here != NULL)
> {
> svn_wc_adm_access_t *adm_access
> - = svn_wc__adm_retrieve_internal2(db, local_abspath, scratch_pool);
> + = svn_wc__adm_retrieve_internal2(wc_ctx->db, local_abspath,
> + scratch_pool);
>
> if (adm_access == NULL)
> {
> svn_wc__db_kind_t kind;
>
> - SVN_ERR(svn_wc__db_read_kind(&kind, db, local_abspath, TRUE,
> + SVN_ERR(svn_wc__db_read_kind(&kind, wc_ctx->db, local_abspath, TRUE,
> scratch_pool));
>
> if (kind != svn_wc__db_kind_dir)
> - adm_access = svn_wc__adm_retrieve_internal2(db,
> + adm_access = svn_wc__adm_retrieve_internal2(wc_ctx->db,
> svn_dirent_dirname(
> local_abspath,
> scratch_pool),
> @@ -1428,25 +1429,12 @@ svn_wc__internal_locked(svn_boolean_t *l
> }
>
> if (locked != NULL)
> - SVN_ERR(svn_wc__db_wclocked(locked, db, local_abspath, scratch_pool));
> + SVN_ERR(svn_wc__db_wclocked(locked, wc_ctx->db, local_abspath,
> + scratch_pool));
>
> return SVN_NO_ERROR;
> }
>
> -svn_error_t *
> -svn_wc_locked2(svn_boolean_t *locked_here,
> - 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__internal_locked(locked_here,
> - locked,
> - wc_ctx->db,
> - local_abspath,
> - scratch_pool));
> -}
>
> const char *
> svn_wc_adm_access_path(const svn_wc_adm_access_t *adm_access)
>
> Modified: trunk/subversion/libsvn_wc/wc.h
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/wc.h?pathrev=40084&r1=40083&r2=40084
> ==============================================================================
> --- trunk/subversion/libsvn_wc/wc.h Fri Oct 16 14:28:15 2009 (r40083)
> +++ trunk/subversion/libsvn_wc/wc.h Fri Oct 16 14:34:44 2009 (r40084)
> @@ -506,15 +506,6 @@ svn_wc__internal_resolved_conflict(svn_w
> void *notify_baton,
> apr_pool_t *scratch_pool);
>
> -/* Library-internal version of svn_wc_locked2(). */
> -svn_error_t *
> -svn_wc__internal_locked(svn_boolean_t *locked_here,
> - svn_boolean_t *locked,
> - svn_wc__db_t *db,
> - const char *local_abspath,
> - apr_pool_t *scratch_pool);
> -
> -
>
> svn_error_t *
> svn_wc__internal_is_replaced(svn_boolean_t *replaced,
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=2408363
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2408432
Received on 2009-10-17 04:58:08 CEST