You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/04/22 23:22:45 UTC
svn commit: r1096047 - in /subversion/trunk/subversion:
include/private/svn_wc_private.h libsvn_wc/adm_ops.c libsvn_wc/wc.h
Author: hwright
Date: Fri Apr 22 21:22:45 2011
New Revision: 1096047
URL: http://svn.apache.org/viewvc?rev=1096047&view=rev
Log:
Const-ify an arguments. We end up having to cast the const away before
calling APR, but at least our code is more correct.
* subversion/include/private/svn_wc_private.h
(svn_wc__changelist_match): Const-ify the clhash param.
* subversion/libsvn_wc/wc.h
(svn_wc__internal_changelist_match): Same.
* subversion/libsvn_wc/adm_ops.c
(svn_wc__changelist_match): Same.
(svn_wc__internal_changelist_match): Same, and cast away the const-ness
before calling APR.
Modified:
subversion/trunk/subversion/include/private/svn_wc_private.h
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/libsvn_wc/wc.h
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=1096047&r1=1096046&r2=1096047&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Fri Apr 22 21:22:45 2011
@@ -50,7 +50,7 @@ extern "C" {
svn_boolean_t
svn_wc__changelist_match(svn_wc_context_t *wc_ctx,
const char *local_abspath,
- apr_hash_t *clhash,
+ const apr_hash_t *clhash,
apr_pool_t *scratch_pool);
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1096047&r1=1096046&r2=1096047&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Fri Apr 22 21:22:45 2011
@@ -2315,7 +2315,7 @@ svn_wc__set_file_external_location(svn_w
svn_boolean_t
svn_wc__internal_changelist_match(svn_wc__db_t *db,
const char *local_abspath,
- apr_hash_t *clhash,
+ const apr_hash_t *clhash,
apr_pool_t *scratch_pool)
{
svn_error_t *err;
@@ -2337,13 +2337,14 @@ svn_wc__internal_changelist_match(svn_wc
}
return (changelist
- && apr_hash_get(clhash, changelist, APR_HASH_KEY_STRING) != NULL);
+ && apr_hash_get( (apr_hash_t *)clhash, changelist,
+ APR_HASH_KEY_STRING) != NULL);
}
svn_boolean_t
svn_wc__changelist_match(svn_wc_context_t *wc_ctx,
const char *local_abspath,
- apr_hash_t *clhash,
+ const apr_hash_t *clhash,
apr_pool_t *scratch_pool)
{
return svn_wc__internal_changelist_match(wc_ctx->db, local_abspath, clhash,
Modified: subversion/trunk/subversion/libsvn_wc/wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc.h?rev=1096047&r1=1096046&r2=1096047&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc.h Fri Apr 22 21:22:45 2011
@@ -564,7 +564,7 @@ svn_wc__internal_ensure_adm(svn_wc__db_t
svn_boolean_t
svn_wc__internal_changelist_match(svn_wc__db_t *db,
const char *local_abspath,
- apr_hash_t *clhash,
+ const apr_hash_t *clhash,
apr_pool_t *scratch_pool);
/* Library-internal version of svn_wc_walk_status(), which see. */