From patchwork Wed Sep 11 09:08:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 274201 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 6198F2C0340 for ; Wed, 11 Sep 2013 19:08:24 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1VJgPO-0004qV-21; Wed, 11 Sep 2013 09:08:22 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1VJgPJ-0004qL-ET for fwts-devel@lists.ubuntu.com; Wed, 11 Sep 2013 09:08:17 +0000 Received: from cpc3-craw6-2-0-cust180.croy.cable.virginmedia.com ([77.100.248.181] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1VJgPJ-0005Wq-BO for fwts-devel@lists.ubuntu.com; Wed, 11 Sep 2013 09:08:17 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH] lib: framework: report warning[s] correctly (LP:#1223736) Date: Wed, 11 Sep 2013 10:08:16 +0100 Message-Id: <1378890496-5119-1-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 1.8.3.2 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: fwts-devel-bounces@lists.ubuntu.com From: Colin Ian King Report "warnings" for more than 1 warning, or "warning" for 1 warning. Correcly pluaralise. Signed-off-by: Colin Ian King Acked-by: Ivan Hu Acked-by: Keng-Yu Lin --- src/lib/src/fwts_framework.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/src/fwts_framework.c b/src/lib/src/fwts_framework.c index d44fc22..e2b8805 100644 --- a/src/lib/src/fwts_framework.c +++ b/src/lib/src/fwts_framework.c @@ -319,7 +319,9 @@ static void fwts_framework_format_results(char *buffer, int buflen, fwts_results buflen -= n; } if ((include_zero_results || (results->warning > 0)) && (buflen > 0)) { - n = snprintf(buffer, buflen, "%s%u warnings", n > 0 ? ", " : "", results->warning); + n = snprintf(buffer, buflen, "%s%u warning%s", + n > 0 ? ", " : "", results->warning, + results->warning > 1 ? "s" : ""); buffer += n; buflen -= n; }