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/10/24 18:51:41 UTC
svn commit: r1188224 - /subversion/trunk/subversion/libsvn_client/diff.c
Author: hwright
Date: Mon Oct 24 16:51:41 2011
New Revision: 1188224
URL: http://svn.apache.org/viewvc?rev=1188224&view=rev
Log:
Use a non-deprecated function, and introduce an iterpool in the mergeinfo diff
display loop.
* subversion/libsvn_client/diff.c
(display_mergeinfo_diff): As above.
Modified:
subversion/trunk/subversion/libsvn_client/diff.c
Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1188224&r1=1188223&r2=1188224&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Mon Oct 24 16:51:41 2011
@@ -82,6 +82,7 @@ display_mergeinfo_diff(const char *old_m
apr_pool_t *pool)
{
apr_hash_t *old_mergeinfo_hash, *new_mergeinfo_hash, *added, *deleted;
+ apr_pool_t *iterpool = svn_pool_create(pool);
apr_hash_index_t *hi;
if (old_mergeinfo_val)
@@ -94,9 +95,9 @@ display_mergeinfo_diff(const char *old_m
else
new_mergeinfo_hash = NULL;
- SVN_ERR(svn_mergeinfo_diff(&deleted, &added, old_mergeinfo_hash,
- new_mergeinfo_hash,
- TRUE, pool));
+ SVN_ERR(svn_mergeinfo_diff2(&deleted, &added, old_mergeinfo_hash,
+ new_mergeinfo_hash,
+ TRUE, pool, pool));
for (hi = apr_hash_first(pool, deleted);
hi; hi = apr_hash_next(hi))
@@ -105,9 +106,11 @@ display_mergeinfo_diff(const char *old_m
apr_array_header_t *merge_revarray = svn__apr_hash_index_val(hi);
svn_string_t *merge_revstr;
- SVN_ERR(svn_rangelist_to_string(&merge_revstr, merge_revarray, pool));
+ svn_pool_clear(iterpool);
+ SVN_ERR(svn_rangelist_to_string(&merge_revstr, merge_revarray,
+ iterpool));
- SVN_ERR(svn_stream_printf_from_utf8(outstream, encoding, pool,
+ SVN_ERR(svn_stream_printf_from_utf8(outstream, encoding, iterpool,
_(" Reverse-merged %s:r%s%s"),
from_path, merge_revstr->data,
APR_EOL_STR));
@@ -120,14 +123,17 @@ display_mergeinfo_diff(const char *old_m
apr_array_header_t *merge_revarray = svn__apr_hash_index_val(hi);
svn_string_t *merge_revstr;
- SVN_ERR(svn_rangelist_to_string(&merge_revstr, merge_revarray, pool));
+ svn_pool_clear(iterpool);
+ SVN_ERR(svn_rangelist_to_string(&merge_revstr, merge_revarray,
+ iterpool));
- SVN_ERR(svn_stream_printf_from_utf8(outstream, encoding, pool,
+ SVN_ERR(svn_stream_printf_from_utf8(outstream, encoding, iterpool,
_(" Merged %s:r%s%s"),
from_path, merge_revstr->data,
APR_EOL_STR));
}
+ svn_pool_destroy(iterpool);
return SVN_NO_ERROR;
}