From 10aa70a53b2002afbc82a58e94e6507238ed4f02 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 29 Apr 2012 00:09:34 -0400 Subject: [PATCH] Bug #997 - Fixed bug #997, so that output is correctly conrolled by the 'affected' verbosity token. --- ChangeLog | 2 ++ src/commands/CmdCustom.cpp | 15 +++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 88a19b223..66db3fed5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,8 @@ Bugs clearly stated (thanks to Louis-Claude Canon). + Applied patch for bug #991, which removes an obsolete consistency check (thanks to Louis-Claude Canon). + + Fixed bug #997, so that output is correctly conrolled by the 'affected' + verbosity token. + Fixed grammar in feedback string (thanks to Uli Martens). + Addressed valgrind complaints (thanks to Bryce Harrington). + Removed default configuration value for the obsolete 'annotations' setting. diff --git a/src/commands/CmdCustom.cpp b/src/commands/CmdCustom.cpp index d81fdecde..1fc67f3a0 100644 --- a/src/commands/CmdCustom.cpp +++ b/src/commands/CmdCustom.cpp @@ -162,21 +162,20 @@ int CmdCustom::execute (std::string& output) << optionalBlankLine (); if (context.verbose ("affected")) + { out << (filtered.size () == 1 ? STRING_CMD_CUSTOM_COUNT : format (STRING_CMD_CUSTOM_COUNTN, filtered.size ())); - // TODO Conditional - if (maxrows && maxrows < (int)filtered.size ()) - out << ", " << format (STRING_CMD_CUSTOM_SHOWN, maxrows); + if (maxrows && maxrows < (int)filtered.size ()) + out << ", " << format (STRING_CMD_CUSTOM_SHOWN, maxrows); - // TODO Conditional - if (maxlines && maxlines < (int)filtered.size ()) - out << ", " - << format (STRING_CMD_CUSTOM_TRUNCATED, maxlines - table_header); + if (maxlines && maxlines < (int)filtered.size ()) + out << ", " + << format (STRING_CMD_CUSTOM_TRUNCATED, maxlines - table_header); - if (context.verbose ("affected")) out << "\n"; + } } else {