From patchwork Wed Feb 17 18:40:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 584292 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AC6E3140328 for ; Thu, 18 Feb 2016 05:41:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422866AbcBQSlZ (ORCPT ); Wed, 17 Feb 2016 13:41:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35560 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422865AbcBQSlU (ORCPT ); Wed, 17 Feb 2016 13:41:20 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id C762EC0005D1; Wed, 17 Feb 2016 18:41:20 +0000 (UTC) Received: from hawk.localdomain.com (dhcp-1-251.brq.redhat.com [10.34.1.251]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1HIf34K030058; Wed, 17 Feb 2016 13:41:18 -0500 From: Andrew Jones To: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Cc: thuth@redhat.com, dgibson@redhat.com, david@gibson.dropbear.id.au, agraf@suse.de, lvivier@redhat.com, pbonzini@redhat.com, rkrcmar@redhat.com Subject: [kvm-unit-tests PATCH v5 06/18] lib: add vprintf Date: Wed, 17 Feb 2016 19:40:47 +0100 Message-Id: <1455734459-31902-7-git-send-email-drjones@redhat.com> In-Reply-To: <1455734459-31902-1-git-send-email-drjones@redhat.com> References: <1455734459-31902-1-git-send-email-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org va_report_xfail has the pattern char buf[] vsnprintf(buf, ...) puts(buf) Before adding another one, replace it with vprintf. Suggested-by: David Gibson Signed-off-by: Andrew Jones Reviewed-by: David Gibson Reviewed-by: Thomas Huth --- lib/libcflat.h | 1 + lib/printf.c | 14 +++++++++++++- lib/report.c | 4 +--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/lib/libcflat.h b/lib/libcflat.h index 9747ccdbc9f1d..f7a5728c6759a 100644 --- a/lib/libcflat.h +++ b/lib/libcflat.h @@ -55,6 +55,7 @@ extern void abort(void); extern int printf(const char *fmt, ...); extern int snprintf(char *buf, int size, const char *fmt, ...); extern int vsnprintf(char *buf, int size, const char *fmt, va_list va); +extern int vprintf(const char *fmt, va_list va); extern long atol(const char *ptr); void report_prefix_push(const char *prefix); diff --git a/lib/printf.c b/lib/printf.c index 5d83605afe829..2aec59aa6d6d4 100644 --- a/lib/printf.c +++ b/lib/printf.c @@ -1,5 +1,7 @@ #include "libcflat.h" +#define BUFSZ 2000 + typedef struct pstream { char *buffer; int remain; @@ -235,10 +237,20 @@ int snprintf(char *buf, int size, const char *fmt, ...) return r; } +int vprintf(const char *fmt, va_list va) +{ + char buf[BUFSZ]; + int r; + + r = vsnprintf(buf, sizeof(buf), fmt, va); + puts(buf); + return r; +} + int printf(const char *fmt, ...) { va_list va; - char buf[2000]; + char buf[BUFSZ]; int r; va_start(va, fmt); diff --git a/lib/report.c b/lib/report.c index 35e664108a921..c29e835b9c751 100644 --- a/lib/report.c +++ b/lib/report.c @@ -47,15 +47,13 @@ void va_report_xfail(const char *msg_fmt, bool xfail, bool cond, va_list va) { char *pass = xfail ? "XPASS" : "PASS"; char *fail = xfail ? "XFAIL" : "FAIL"; - char buf[2000]; spin_lock(&lock); tests++; printf("%s: ", cond ? pass : fail); puts(prefixes); - vsnprintf(buf, sizeof(buf), msg_fmt, va); - puts(buf); + vprintf(msg_fmt, va); puts("\n"); if (xfail && cond) failures++;