On the verify-keep-going branch, uncouple the --keep-going option from the --quiet option. Currently, --quiet suppresses notifications, and hence also the summary printed by --keep-going. But there is no need to encode this assumption in the --keep-going code path. * subversion/svnadmin/svnadmin.c (subcommand_verify): Create error summary list, and show the summary if the list is not empty, even if --quiet was given, Always create a result pool for the notification callback to use. I've included a drive-by indentation fix as well. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/verify-keep-going@1546109 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/subversion/svnadmin/svnadmin.c b/subversion/svnadmin/svnadmin.c index e03e1ba..21304f4 100644 --- a/subversion/svnadmin/svnadmin.c +++ b/subversion/svnadmin/svnadmin.c
@@ -1741,16 +1741,13 @@ } if (! opt_state->quiet) - { - notify_baton.feedback_stream = recode_stream_create(stdout, pool); + notify_baton.feedback_stream = recode_stream_create(stdout, pool); - if (opt_state->keep_going) - { - notify_baton.error_summary = - apr_array_make(pool, 0, sizeof(struct verification_error *)); - notify_baton.result_pool = pool; - } - } + if (opt_state->keep_going) + notify_baton.error_summary = + apr_array_make(pool, 0, sizeof(struct verification_error *)); + + notify_baton.result_pool = pool; verify_err = svn_repos_verify_fs3(repos, lower, upper, opt_state->keep_going, @@ -1761,8 +1758,7 @@ NULL, pool); /* Show the --keep-going error summary. */ - if (!opt_state->quiet && opt_state->keep_going && - notify_baton.error_summary->nelts > 0) + if (opt_state->keep_going && notify_baton.error_summary->nelts > 0) { apr_pool_t *iterpool; int i; @@ -1781,7 +1777,7 @@ svn_pool_clear(iterpool); verr = APR_ARRAY_IDX(notify_baton.error_summary, i, - struct verification_error *); + struct verification_error *); rev_str = apr_psprintf(iterpool, "r%ld", verr->rev); for (err = svn_error_purge_tracing(verr->err); err != SVN_NO_ERROR; err = err->child)