You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2014/03/11 13:01:48 UTC
svn commit: r1576294 - in /subversion/trunk/subversion: libsvn_fs_fs/id.c
libsvn_fs_fs/transaction.c libsvn_fs_fs/verify.c libsvn_fs_x/id.c
libsvn_subr/hash.c libsvn_subr/temp_serializer.c
Author: julianfoad
Date: Tue Mar 11 12:01:48 2014
New Revision: 1576294
URL: http://svn.apache.org/r1576294
Log:
Stop casting away 'const' in a few places where it's easy to do so. Reduces
compiler warnings with GCC.
* subversion/libsvn_fs_x/id.c
(svn_fs_x__id_node_id,
svn_fs_x__id_copy_id,
svn_fs_x__id_txn_id,
svn_fs_x__id_noderev_id,
svn_fs_x__id_rev,
svn_fs_x__id_item,
svn_fs_x__id_is_txn,
svn_fs_x__id_unparse,
svn_fs_x__id_eq,
svn_fs_x__id_check_related,
svn_fs_x__id_copy): Don't cast away 'const'.
* subversion/libsvn_fs_fs/id.c
(svn_fs_fs__id_node_id,
svn_fs_fs__id_copy_id,
svn_fs_fs__id_txn_id,
svn_fs_fs__id_rev_item,
svn_fs_fs__id_rev,
svn_fs_fs__id_item,
svn_fs_fs__id_is_txn,
svn_fs_fs__id_unparse,
svn_fs_fs__id_eq,
svn_fs_fs__id_check_related,
svn_fs_fs__id_copy): Same.
* subversion/libsvn_fs_fs/transaction.c
(fnv1a_checksum_finalize): Same.
* subversion/libsvn_fs_fs/verify.c
(expected_streamed_checksum): Same.
* subversion/libsvn_subr/hash.c
(hashfunc_compatible): Same.
* subversion/libsvn_subr/temp_serializer.c
(svn_temp_serializer__add_string): Same.
Modified:
subversion/trunk/subversion/libsvn_fs_fs/id.c
subversion/trunk/subversion/libsvn_fs_fs/transaction.c
subversion/trunk/subversion/libsvn_fs_fs/verify.c
subversion/trunk/subversion/libsvn_fs_x/id.c
subversion/trunk/subversion/libsvn_subr/hash.c
subversion/trunk/subversion/libsvn_subr/temp_serializer.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/id.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/id.c?rev=1576294&r1=1576293&r2=1576294&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/id.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/id.c Tue Mar 11 12:01:48 2014
@@ -190,7 +190,7 @@ svn_fs_fs__id_txn_unparse(const svn_fs_f
const svn_fs_fs__id_part_t *
svn_fs_fs__id_node_id(const svn_fs_id_t *fs_id)
{
- fs_fs__id_t *id = (fs_fs__id_t *)fs_id;
+ const fs_fs__id_t *id = (const fs_fs__id_t *)fs_id;
return &id->private_id.node_id;
}
@@ -199,7 +199,7 @@ svn_fs_fs__id_node_id(const svn_fs_id_t
const svn_fs_fs__id_part_t *
svn_fs_fs__id_copy_id(const svn_fs_id_t *fs_id)
{
- fs_fs__id_t *id = (fs_fs__id_t *)fs_id;
+ const fs_fs__id_t *id = (const fs_fs__id_t *)fs_id;
return &id->private_id.copy_id;
}
@@ -208,7 +208,7 @@ svn_fs_fs__id_copy_id(const svn_fs_id_t
const svn_fs_fs__id_part_t *
svn_fs_fs__id_txn_id(const svn_fs_id_t *fs_id)
{
- fs_fs__id_t *id = (fs_fs__id_t *)fs_id;
+ const fs_fs__id_t *id = (const fs_fs__id_t *)fs_id;
return &id->private_id.txn_id;
}
@@ -217,7 +217,7 @@ svn_fs_fs__id_txn_id(const svn_fs_id_t *
const svn_fs_fs__id_part_t *
svn_fs_fs__id_rev_item(const svn_fs_id_t *fs_id)
{
- fs_fs__id_t *id = (fs_fs__id_t *)fs_id;
+ const fs_fs__id_t *id = (const fs_fs__id_t *)fs_id;
return &id->private_id.rev_item;
}
@@ -225,7 +225,7 @@ svn_fs_fs__id_rev_item(const svn_fs_id_t
svn_revnum_t
svn_fs_fs__id_rev(const svn_fs_id_t *fs_id)
{
- fs_fs__id_t *id = (fs_fs__id_t *)fs_id;
+ const fs_fs__id_t *id = (const fs_fs__id_t *)fs_id;
return id->private_id.rev_item.revision;
}
@@ -233,7 +233,7 @@ svn_fs_fs__id_rev(const svn_fs_id_t *fs_
apr_uint64_t
svn_fs_fs__id_item(const svn_fs_id_t *fs_id)
{
- fs_fs__id_t *id = (fs_fs__id_t *)fs_id;
+ const fs_fs__id_t *id = (const fs_fs__id_t *)fs_id;
return id->private_id.rev_item.number;
}
@@ -241,7 +241,7 @@ svn_fs_fs__id_item(const svn_fs_id_t *fs
svn_boolean_t
svn_fs_fs__id_is_txn(const svn_fs_id_t *fs_id)
{
- fs_fs__id_t *id = (fs_fs__id_t *)fs_id;
+ const fs_fs__id_t *id = (const fs_fs__id_t *)fs_id;
return svn_fs_fs__id_txn_used(&id->private_id.txn_id);
}
@@ -251,7 +251,7 @@ svn_fs_fs__id_unparse(const svn_fs_id_t
apr_pool_t *pool)
{
char string[6 * SVN_INT64_BUFFER_SIZE + 10];
- fs_fs__id_t *id = (fs_fs__id_t *)fs_id;
+ const fs_fs__id_t *id = (const fs_fs__id_t *)fs_id;
char *p = unparse_id_part(string, &id->private_id.node_id);
p = unparse_id_part(p, &id->private_id.copy_id);
@@ -281,8 +281,8 @@ svn_boolean_t
svn_fs_fs__id_eq(const svn_fs_id_t *a,
const svn_fs_id_t *b)
{
- fs_fs__id_t *id_a = (fs_fs__id_t *)a;
- fs_fs__id_t *id_b = (fs_fs__id_t *)b;
+ const fs_fs__id_t *id_a = (const fs_fs__id_t *)a;
+ const fs_fs__id_t *id_b = (const fs_fs__id_t *)b;
if (a == b)
return TRUE;
@@ -296,8 +296,8 @@ svn_boolean_t
svn_fs_fs__id_check_related(const svn_fs_id_t *a,
const svn_fs_id_t *b)
{
- fs_fs__id_t *id_a = (fs_fs__id_t *)a;
- fs_fs__id_t *id_b = (fs_fs__id_t *)b;
+ const fs_fs__id_t *id_a = (const fs_fs__id_t *)a;
+ const fs_fs__id_t *id_b = (const fs_fs__id_t *)b;
if (a == b)
return TRUE;
@@ -423,7 +423,7 @@ svn_fs_fs__id_rev_create(const svn_fs_fs
svn_fs_id_t *
svn_fs_fs__id_copy(const svn_fs_id_t *source, apr_pool_t *pool)
{
- fs_fs__id_t *id = (fs_fs__id_t *)source;
+ const fs_fs__id_t *id = (const fs_fs__id_t *)source;
fs_fs__id_t *new_id = apr_palloc(pool, sizeof(*new_id));
*new_id = *id;
Modified: subversion/trunk/subversion/libsvn_fs_fs/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/transaction.c?rev=1576294&r1=1576293&r2=1576294&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/transaction.c Tue Mar 11 12:01:48 2014
@@ -1765,7 +1765,7 @@ fnv1a_checksum_finalize(apr_uint32_t *di
SVN_ERR(svn_checksum_final(&checksum, context, scratch_pool));
SVN_ERR_ASSERT(checksum->kind == svn_checksum_fnv1a_32x4);
- *digest = ntohl(*(apr_uint32_t *)(checksum->digest));
+ *digest = ntohl(*(const apr_uint32_t *)(checksum->digest));
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_fs_fs/verify.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/verify.c?rev=1576294&r1=1576293&r2=1576294&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/verify.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/verify.c Tue Mar 11 12:01:48 2014
@@ -469,7 +469,7 @@ expected_streamed_checksum(apr_file_t *f
SVN_ERR(svn_checksum_final(&checksum, context, pool));
SVN_ERR(expected_checksum(file, entry,
- ntohl(*(apr_uint32_t *)checksum->digest),
+ ntohl(*(const apr_uint32_t *)checksum->digest),
pool));
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/libsvn_fs_x/id.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/id.c?rev=1576294&r1=1576293&r2=1576294&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/id.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/id.c Tue Mar 11 12:01:48 2014
@@ -160,7 +160,7 @@ svn_fs_x__id_part_eq(const svn_fs_x__id_
const svn_fs_x__id_part_t *
svn_fs_x__id_node_id(const svn_fs_id_t *fs_id)
{
- fs_x__id_t *id = (fs_x__id_t *)fs_id;
+ const fs_x__id_t *id = (const fs_x__id_t *)fs_id;
return &id->node_id;
}
@@ -169,7 +169,7 @@ svn_fs_x__id_node_id(const svn_fs_id_t *
const svn_fs_x__id_part_t *
svn_fs_x__id_copy_id(const svn_fs_id_t *fs_id)
{
- fs_x__id_t *id = (fs_x__id_t *)fs_id;
+ const fs_x__id_t *id = (const fs_x__id_t *)fs_id;
return &id->copy_id;
}
@@ -178,7 +178,7 @@ svn_fs_x__id_copy_id(const svn_fs_id_t *
svn_fs_x__txn_id_t
svn_fs_x__id_txn_id(const svn_fs_id_t *fs_id)
{
- fs_x__id_t *id = (fs_x__id_t *)fs_id;
+ const fs_x__id_t *id = (const fs_x__id_t *)fs_id;
return svn_fs_x__get_txn_id(id->noderev_id.change_set);
}
@@ -187,7 +187,7 @@ svn_fs_x__id_txn_id(const svn_fs_id_t *f
const svn_fs_x__id_part_t *
svn_fs_x__id_noderev_id(const svn_fs_id_t *fs_id)
{
- fs_x__id_t *id = (fs_x__id_t *)fs_id;
+ const fs_x__id_t *id = (const fs_x__id_t *)fs_id;
return &id->noderev_id;
}
@@ -195,7 +195,7 @@ svn_fs_x__id_noderev_id(const svn_fs_id_
svn_revnum_t
svn_fs_x__id_rev(const svn_fs_id_t *fs_id)
{
- fs_x__id_t *id = (fs_x__id_t *)fs_id;
+ const fs_x__id_t *id = (const fs_x__id_t *)fs_id;
return svn_fs_x__get_revnum(id->noderev_id.change_set);
}
@@ -204,7 +204,7 @@ svn_fs_x__id_rev(const svn_fs_id_t *fs_i
apr_uint64_t
svn_fs_x__id_item(const svn_fs_id_t *fs_id)
{
- fs_x__id_t *id = (fs_x__id_t *)fs_id;
+ const fs_x__id_t *id = (const fs_x__id_t *)fs_id;
return id->noderev_id.number;
}
@@ -212,7 +212,7 @@ svn_fs_x__id_item(const svn_fs_id_t *fs_
svn_boolean_t
svn_fs_x__id_is_txn(const svn_fs_id_t *fs_id)
{
- fs_x__id_t *id = (fs_x__id_t *)fs_id;
+ const fs_x__id_t *id = (const fs_x__id_t *)fs_id;
return svn_fs_x__is_txn(id->noderev_id.change_set);
}
@@ -222,7 +222,7 @@ svn_fs_x__id_unparse(const svn_fs_id_t *
apr_pool_t *pool)
{
char string[6 * SVN_INT64_BUFFER_SIZE + 10];
- fs_x__id_t *id = (fs_x__id_t *)fs_id;
+ const fs_x__id_t *id = (const fs_x__id_t *)fs_id;
char *p = part_unparse(string, &id->node_id);
*(p++) = '.';
@@ -240,8 +240,8 @@ svn_boolean_t
svn_fs_x__id_eq(const svn_fs_id_t *a,
const svn_fs_id_t *b)
{
- fs_x__id_t *id_a = (fs_x__id_t *)a;
- fs_x__id_t *id_b = (fs_x__id_t *)b;
+ const fs_x__id_t *id_a = (const fs_x__id_t *)a;
+ const fs_x__id_t *id_b = (const fs_x__id_t *)b;
if (a == b)
return TRUE;
@@ -255,8 +255,8 @@ svn_boolean_t
svn_fs_x__id_check_related(const svn_fs_id_t *a,
const svn_fs_id_t *b)
{
- fs_x__id_t *id_a = (fs_x__id_t *)a;
- fs_x__id_t *id_b = (fs_x__id_t *)b;
+ const fs_x__id_t *id_a = (const fs_x__id_t *)a;
+ const fs_x__id_t *id_b = (const fs_x__id_t *)b;
if (a == b)
return TRUE;
@@ -384,7 +384,7 @@ svn_fs_x__id_create(const svn_fs_x__id_p
svn_fs_id_t *
svn_fs_x__id_copy(const svn_fs_id_t *source, apr_pool_t *pool)
{
- fs_x__id_t *id = (fs_x__id_t *)source;
+ const fs_x__id_t *id = (const fs_x__id_t *)source;
fs_x__id_t *new_id = apr_pmemdup(pool, id, sizeof(*id));
new_id->generic_id.fsap_data = new_id;
Modified: subversion/trunk/subversion/libsvn_subr/hash.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/hash.c?rev=1576294&r1=1576293&r2=1576294&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/hash.c (original)
+++ subversion/trunk/subversion/libsvn_subr/hash.c Tue Mar 11 12:01:48 2014
@@ -622,7 +622,7 @@ hashfunc_compatible(const char *char_key
#if SVN_UNALIGNED_ACCESS_IS_OK
for (p = key, i = *klen; i >= 4; i-=4, p+=4)
{
- apr_uint32_t chunk = *(apr_uint32_t *)p;
+ apr_uint32_t chunk = *(const apr_uint32_t *)p;
/* the ">> 17" part gives upper bits in the chunk a chance to make
some impact as well */
Modified: subversion/trunk/subversion/libsvn_subr/temp_serializer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/temp_serializer.c?rev=1576294&r1=1576293&r2=1576294&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/temp_serializer.c (original)
+++ subversion/trunk/subversion/libsvn_subr/temp_serializer.c Tue Mar 11 12:01:48 2014
@@ -312,7 +312,7 @@ svn_temp_serializer__add_string(svn_temp
/* Store the offset at which the string data that will the appended.
* Write 0 for NULL pointers. Strings don't need special alignment. */
- store_current_end_pointer(context, (const void **)s);
+ store_current_end_pointer(context, (const void *const *)s);
/* append the string data */
if (string)