Author: cmpilato
Date: Wed Nov 16 14:35:58 2011
New Revision: 1202721
URL: http://svn.apache.org/viewvc?rev=1202721&view=rev
Log:
Eliminate a boolean that only ever sees one state.
* subversion/svn/cl.h
(svn_cl__get_notifier): Remove 'suppress_final_line' parameter
(which was named 'suppress_summary_lines' in the function's actual
implementation).
* subversion/svn/notify.c
(struct notify_baton): Remove effectively unused
'suppress_summary_lines' member. (It was always FALSE.)
(notify): Track removal of 'suppress_summary_lines' baton member.
(svn_cl__get_notifier): Remove 'suppress_summary_lines' parameter.
* subversion/svn/main.c
(main): Update call to svn_cl__get_notifier().
Modified:
subversion/trunk/subversion/svn/cl.h
subversion/trunk/subversion/svn/main.c
subversion/trunk/subversion/svn/notify.c
Modified: subversion/trunk/subversion/svn/cl.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cl.h?rev=1202721&r1=1202720&r2=1202721&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cl.h (original)
+++ subversion/trunk/subversion/svn/cl.h Wed Nov 16 14:35:58 2011
@@ -564,14 +564,10 @@ svn_cl__merge_file_externally(const char
/* Set *NOTIFY_FUNC_P and *NOTIFY_BATON_P to a notifier/baton for all
* operations, allocated in POOL.
- *
- * If don't want a summary line at the end of notifications, set
- * SUPPRESS_FINAL_LINE.
*/
svn_error_t *
svn_cl__get_notifier(svn_wc_notify_func2_t *notify_func_p,
void **notify_baton_p,
- svn_boolean_t suppress_final_line,
apr_pool_t *pool);
/* Make the notifier for use with BATON print the appropriate summary
Modified: subversion/trunk/subversion/svn/main.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1202721&r1=1202720&r2=1202721&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Wed Nov 16 14:35:58 2011
@@ -2522,8 +2522,7 @@ main(int argc, const char *argv[])
if (((subcommand->cmd_func != svn_cl__status) && !opt_state.quiet)
|| ((subcommand->cmd_func == svn_cl__status) && !opt_state.xml))
{
- err = svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
- FALSE, pool);
+ err = svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
pool);
if (err)
return svn_cmdline_handle_exit_error(err, pool, "svn: ");
}
Modified: subversion/trunk/subversion/svn/notify.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/notify.c?rev=1202721&r1=1202720&r2=1202721&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/notify.c (original)
+++ subversion/trunk/subversion/svn/notify.c Wed Nov 16 14:35:58 2011
@@ -47,7 +47,6 @@ struct notify_baton
svn_boolean_t is_checkout;
svn_boolean_t is_export;
svn_boolean_t is_wc_to_repos_copy;
- svn_boolean_t suppress_summary_lines;
svn_boolean_t sent_first_txdelta;
svn_boolean_t in_external;
svn_boolean_t had_print_error; /* Used to not keep printing error messages
@@ -583,8 +582,7 @@ notify(void *baton, const svn_wc_notify_
break;
case svn_wc_notify_update_started:
- if (! (nb->suppress_summary_lines ||
- nb->in_external ||
+ if (! (nb->in_external ||
nb->is_checkout ||
nb->is_export))
{
@@ -596,8 +594,6 @@ notify(void *baton, const svn_wc_notify_
case svn_wc_notify_update_completed:
{
- if (! nb->suppress_summary_lines)
- {
if (SVN_IS_VALID_REVNUM(n->revision))
{
if (nb->is_export)
@@ -668,7 +664,6 @@ notify(void *baton, const svn_wc_notify_
goto print_error;
}
}
- }
}
if (nb->in_external)
@@ -1016,7 +1011,6 @@ notify(void *baton, const svn_wc_notify_
svn_error_t *
svn_cl__get_notifier(svn_wc_notify_func2_t *notify_func_p,
void **notify_baton_p,
- svn_boolean_t suppress_summary_lines,
apr_pool_t *pool)
{
struct notify_baton *nb = apr_pcalloc(pool, sizeof(*nb));
@@ -1026,7 +1020,6 @@ svn_cl__get_notifier(svn_wc_notify_func2
nb->is_checkout = FALSE;
nb->is_export = FALSE;
nb->is_wc_to_repos_copy = FALSE;
- nb->suppress_summary_lines = suppress_summary_lines;
nb->in_external = FALSE;
nb->had_print_error = FALSE;
nb->text_conflicts = 0;
