Author: julianfoad
Date: Thu Mar 11 16:13:39 2010
New Revision: 921916
URL: http://svn.apache.org/viewvc?rev=921916&view=rev
Log:
Eliminate or comment a few type casts.
* subversion/libsvn_repos/fs-wrap.c
(svn_repos_fs_get_mergeinfo): Comment a type cast.
* subversion/libsvn_repos/load.c
(renumber_mergeinfo_revs): Eliminate two type casts.
* subversion/svn/status-cmd.c
(print_status): Eliminate a type cast.
Modified:
subversion/trunk/subversion/libsvn_repos/fs-wrap.c
subversion/trunk/subversion/libsvn_repos/load.c
subversion/trunk/subversion/svn/status-cmd.c
Modified: subversion/trunk/subversion/libsvn_repos/fs-wrap.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/fs-wrap.c?rev=921916&r1=921915&r2=921916&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/fs-wrap.c (original)
+++ subversion/trunk/subversion/libsvn_repos/fs-wrap.c Thu Mar 11 16:13:39 2010
@@ -586,6 +586,8 @@ svn_repos_fs_get_mergeinfo(svn_mergeinfo
void *authz_read_baton,
apr_pool_t *pool)
{
+ /* Here we cast away 'const', but won't try to write through this pointer
+ * without first allocating a new array. */
apr_array_header_t *readable_paths = (apr_array_header_t *) paths;
svn_fs_root_t *root;
apr_pool_t *iterpool = svn_pool_create(pool);
Modified: subversion/trunk/subversion/libsvn_repos/load.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/load.c?rev=921916&r1=921915&r2=921916&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/load.c (original)
+++ subversion/trunk/subversion/libsvn_repos/load.c Thu Mar 11 16:13:39 2010
@@ -279,8 +279,8 @@ renumber_mergeinfo_revs(svn_string_t **f
void *val;
apr_hash_this(hi, &key, NULL, &val);
- merge_source = (const char *) key;
- rangelist = (apr_array_header_t *) val;
+ merge_source = key;
+ rangelist = val;
/* Possibly renumber revisions in merge source's rangelist. */
for (i = 0; i < rangelist->nelts; i++)
Modified: subversion/trunk/subversion/svn/status-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/status-cmd.c?rev=921916&r1=921915&r2=921916&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/status-cmd.c (original)
+++ subversion/trunk/subversion/svn/status-cmd.c Thu Mar 11 16:13:39 2010
@@ -180,7 +180,7 @@ print_status(void *baton,
scache->path = apr_pstrdup(sb->cl_pool, path);
scache->status = svn_wc_dup_status2(status, sb->cl_pool);
- path_array = (apr_array_header_t *)
+ path_array =
apr_hash_get(sb->cached_changelists, cl_key, APR_HASH_KEY_STRING);
if (path_array == NULL)
{
