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/14 15:17:09 UTC
svn commit: r1695902 -
/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/log.c
Author: stefan2
Date: Fri Aug 14 13:17:08 2015
New Revision: 1695902
URL: http://svn.apache.org/r1695902
Log:
On the svn-mergeinfo-normalizer branch:
* tools/client-side/svn-mergeinfo-normalizer/log.c
(append_rev_to_ranges): Yet another pool parameter that should be implicit.
(filter_ranges): Update caller.
Modified:
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/log.c
Modified: subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/log.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/log.c?rev=1695902&r1=1695901&r2=1695902&view=diff
==============================================================================
--- subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/log.c (original)
+++ subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/log.c Fri Aug 14 13:17:08 2015
@@ -330,8 +330,7 @@ svn_min__log(svn_min__log_t **log,
static void
append_rev_to_ranges(svn_rangelist_t *ranges,
svn_revnum_t revision,
- svn_boolean_t inheritable,
- apr_pool_t *result_pool)
+ svn_boolean_t inheritable)
{
svn_merge_range_t *range;
if (ranges->nelts)
@@ -344,7 +343,7 @@ append_rev_to_ranges(svn_rangelist_t *ra
}
}
- range = apr_pcalloc(result_pool, sizeof(*range));
+ range = apr_pcalloc(ranges->pool, sizeof(*range));
range->start = revision - 1;
range->end = revision;
range->inheritable = inheritable;
@@ -467,7 +466,7 @@ filter_ranges(svn_min__log_t *log,
if (path_relavent(changed_path, path, baton))
{
append_rev_to_ranges(result, entry->revision,
- range.inheritable, result_pool);
+ range.inheritable);
break;
}
}