From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Gibson <david@gibson.dropbear.id.au>
Subject: Re: [kvm-unit-tests PATCH v5 06/18] lib: add vprintf
Date: Thu, 18 Feb 2016 13:44:28 +1100
Message-ID: <20160218024428.GD15224@voom.fritz.box>
References: <1455734459-31902-1-git-send-email-drjones@redhat.com>
 <1455734459-31902-7-git-send-email-drjones@redhat.com>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="Xm/fll+QQv+hsKip"
Cc: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, thuth@redhat.com,
	dgibson@redhat.com, agraf@suse.de, lvivier@redhat.com,
	pbonzini@redhat.com, rkrcmar@redhat.com
To: Andrew Jones <drjones@redhat.com>
Return-path: <kvm-owner@vger.kernel.org>
Received: from ozlabs.org ([103.22.144.67]:55009 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1424140AbcBRCte (ORCPT <rfc822;kvm@vger.kernel.org>);
	Wed, 17 Feb 2016 21:49:34 -0500
Content-Disposition: inline
In-Reply-To: <1455734459-31902-7-git-send-email-drjones@redhat.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>


--Xm/fll+QQv+hsKip
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Wed, Feb 17, 2016 at 07:40:47PM +0100, Andrew Jones wrote:
> va_report_xfail has the pattern
>=20
>  char buf[]
>  vsnprintf(buf, ...)
>  puts(buf)
>=20
> Before adding another one, replace it with vprintf.
>=20
> Suggested-by: David Gibson <david@gibson.dropbear.id.au>
> Signed-off-by: Andrew Jones <drjones@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

> ---
>  lib/libcflat.h |  1 +
>  lib/printf.c   | 14 +++++++++++++-
>  lib/report.c   |  4 +---
>  3 files changed, 15 insertions(+), 4 deletions(-)
>=20
> 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);
> =20
>  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"
> =20
> +#define BUFSZ 2000
> +
>  typedef struct pstream {
>      char *buffer;
>      int remain;
> @@ -235,10 +237,20 @@ int snprintf(char *buf, int size, const char *fmt, =
=2E..)
>      return r;
>  }
> =20
> +int vprintf(const char *fmt, va_list va)
> +{
> +    char buf[BUFSZ];
> +    int r;
> +
> +    r =3D 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;
> =20
>      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 =3D xfail ? "XPASS" : "PASS";
>  	char *fail =3D xfail ? "XFAIL" : "FAIL";
> -	char buf[2000];
> =20
>  	spin_lock(&lock);
> =20
>  	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++;

--=20
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

--Xm/fll+QQv+hsKip
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBAgAGBQJWxTAMAAoJEGw4ysog2bOSP3EP/iby6VeOGqsfT6RNyMIPwYJB
SD+RiPl/PQKv7imdHBdb4UPiHydCH7Qyz14lVfRYeijt1SzwrWm34tL+8gKsKWRl
9I80eOG+Xpqi6MNZO80KfzDK8UXyr4NeLT/6kKDu9w8bLDrtuEnuGS+QYO3zfbgg
KRA5AGyN+RPxjs8/47K3JptqZZ0CllB5E/zBATnKEn8rMKgMqm/uRnxDgzSY88/Q
sdvDlgcV+2WJMhW7pqlHmXOONCxWpfDNHxelFSSFE+9kSIR63GAjvth6kug0EY1e
NquMWnGCJjhXDUjUzhXfuBm1SivZuxLM53+C0gtmwErrUuKd6KqumIfKxVY1hWVq
yWprOYSdPsu/qXfUC8g1KZDur4oZ3hYVZaDGtQuPrcIujgcMTLOKTuu8yrcDe5KR
m8zvabOInpy/NXy7UgmGTKyf90243h2txmkt+Vzy7SUUXmNJhBlElaf72V2/bdcN
r2NQ7nCg/jHhPyDfuiyFAaI90TCRjEL2qYL/k1sNpu0uS7zu1tw4MawSnGhl+ufu
OD4Sears+Cq8mXhzXjH3y/D/V9DSi4JwZLJfhJ9+CRIElWpG7B8ybjymR01u5IaD
YhbwzlSQxLzEzXKKiYZoaYoY02499HR7ITYYevkisaZWRSE+QQUox9mCXE7YCCTB
gby3m9axR7SFGRya++fO
=ScPZ
-----END PGP SIGNATURE-----

--Xm/fll+QQv+hsKip--