You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/08/17 00:04:17 UTC
svn commit: r1696168 - in /subversion/trunk/subversion:
svndumpfilter/svndumpfilter.c svnrdump/load_editor.c
tests/libsvn_repos/repos-test.c
Author: stefan2
Date: Sun Aug 16 22:04:17 2015
New Revision: 1696168
URL: http://svn.apache.org/r1696168
Log:
Follow up on r1696166: More sizeof changes when using APR hashes.
* subversion/svndumpfilter/svndumpfilter.c
(new_node_record,
adjust_mergeinfo): Take the key size from the key variable.
* subversion/svnrdump/load_editor.c
(set_revision_mapping): Same.
* subversion/tests/libsvn_repos/repos-test.c
(check_locations_info,
test_get_file_revs): Same.
Modified:
subversion/trunk/subversion/svndumpfilter/svndumpfilter.c
subversion/trunk/subversion/svnrdump/load_editor.c
subversion/trunk/subversion/tests/libsvn_repos/repos-test.c
Modified: subversion/trunk/subversion/svndumpfilter/svndumpfilter.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svndumpfilter/svndumpfilter.c?rev=1696168&r1=1696167&r2=1696168&view=diff
==============================================================================
--- subversion/trunk/subversion/svndumpfilter/svndumpfilter.c (original)
+++ subversion/trunk/subversion/svndumpfilter/svndumpfilter.c Sun Aug 16 22:04:17 2015
@@ -640,7 +640,7 @@ new_node_record(void **node_baton,
cf_orig_rev = SVN_STR_TO_REV(val);
cf_renum_val = apr_hash_get(pb->renumber_history,
&cf_orig_rev,
- sizeof(svn_revnum_t));
+ sizeof(cf_orig_rev));
if (! (cf_renum_val && SVN_IS_VALID_REVNUM(cf_renum_val->rev)))
return svn_error_createf
(SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
@@ -730,14 +730,14 @@ adjust_mergeinfo(svn_string_t **final_va
svn_merge_range_t *);
revmap_start = apr_hash_get(pb->renumber_history,
- &range->start, sizeof(svn_revnum_t));
+ &range->start, sizeof(range->start));
if (! (revmap_start && SVN_IS_VALID_REVNUM(revmap_start->rev)))
return svn_error_createf
(SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
_("No valid revision range 'start' in filtered stream"));
revmap_end = apr_hash_get(pb->renumber_history,
- &range->end, sizeof(svn_revnum_t));
+ &range->end, sizeof(range->end));
if (! (revmap_end && SVN_IS_VALID_REVNUM(revmap_end->rev)))
return svn_error_createf
(SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
Modified: subversion/trunk/subversion/svnrdump/load_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/load_editor.c?rev=1696168&r1=1696167&r2=1696168&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/load_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/load_editor.c Sun Aug 16 22:04:17 2015
@@ -167,8 +167,7 @@ set_revision_mapping(apr_hash_t *rev_map
sizeof(svn_revnum_t) * 2);
mapped_revs[0] = from_rev;
mapped_revs[1] = to_rev;
- apr_hash_set(rev_map, mapped_revs,
- sizeof(svn_revnum_t), mapped_revs + 1);
+ apr_hash_set(rev_map, mapped_revs, sizeof(*mapped_revs), mapped_revs + 1);
}
/* Return the revision to which FROM_REV maps in REV_MAP, or
Modified: subversion/trunk/subversion/tests/libsvn_repos/repos-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_repos/repos-test.c?rev=1696168&r1=1696167&r2=1696168&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_repos/repos-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_repos/repos-test.c Sun Aug 16 22:04:17 2015
@@ -750,8 +750,7 @@ check_locations_info(apr_hash_t *locatio
unsigned int i;
for (i = 0; info->rev != 0; ++i, ++info)
{
- const char *p = apr_hash_get(locations, &info->rev, sizeof
- (svn_revnum_t));
+ const char *p = apr_hash_get(locations, &info->rev, sizeof(info->rev));
if (!p)
return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
"Missing path for revision %ld", info->rev);
@@ -3055,16 +3054,16 @@ test_get_file_revs(const svn_test_opts_t
for (i = 0; i < sizeof(trunk_results) / sizeof(trunk_results[0]); i++)
apr_hash_set(ht_trunk_results, &trunk_results[i].rev,
- sizeof(svn_revnum_t), &trunk_results[i]);
+ sizeof(trunk_results[i].rev), &trunk_results[i]);
for (i = 0; i < sizeof(branch_results) / sizeof(branch_results[0]); i++)
apr_hash_set(ht_branch_results, &branch_results[i].rev,
- sizeof(svn_revnum_t), &branch_results[i]);
+ sizeof(branch_results[i].rev), &branch_results[i]);
for (i = 0; i < sizeof(trunk_results) / sizeof(trunk_results[0]); i++)
if (!trunk_results[i].result_of_merge)
apr_hash_set(ht_reverse_results, &trunk_results[i].rev,
- sizeof(svn_revnum_t), &trunk_results[i]);
+ sizeof(trunk_results[i].rev), &trunk_results[i]);
/* Check for feature support */
if (opts->server_minor_version && (opts->server_minor_version < 5))