From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40850)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1VBmt0-0005XZ-Mu
	for qemu-devel@nongnu.org; Tue, 20 Aug 2013 10:26:25 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1VBmsu-0004DY-Ml
	for qemu-devel@nongnu.org; Tue, 20 Aug 2013 10:26:18 -0400
Received: from mx1.redhat.com ([209.132.183.28]:9727)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1VBmsu-0004DN-F8
	for qemu-devel@nongnu.org; Tue, 20 Aug 2013 10:26:12 -0400
Received: from int-mx12.intmail.prod.int.phx2.redhat.com
	(int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r7KEQAnU021798
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Tue, 20 Aug 2013 10:26:11 -0400
Date: Tue, 20 Aug 2013 10:26:09 -0400
From: Luiz Capitulino <lcapitulino@redhat.com>
Message-ID: <20130820102609.790a47d8@redhat.com>
In-Reply-To: <1376967501-23886-1-git-send-email-famz@redhat.com>
References: <1376967501-23886-1-git-send-email-famz@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH v2] monitor: print the invalid char in
	error message
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Fam Zheng <famz@redhat.com>
Cc: Luiz Capitulino <lcapitul@redhat.com>, qemu-devel@nongnu.org

On Tue, 20 Aug 2013 10:58:21 +0800
Fam Zheng <famz@redhat.com> wrote:

> It's more friendly to print which char is invalid to user, especially
> when user tries to input a float value and expect the monitor to round
> it to int. Since we don't round float number when we look for a integer,
> telling which char is invalid is less confusing.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>

Applied to the qmp branch, thanks.

> ---
>  monitor.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/monitor.c b/monitor.c
> index 5dc0aa9..da9c9a2 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -3171,9 +3171,13 @@ static const MonitorDef monitor_defs[] = {
>      { NULL },
>  };
>  
> -static void expr_error(Monitor *mon, const char *msg)
> +static void expr_error(Monitor *mon, const char *fmt, ...)
>  {
> -    monitor_printf(mon, "%s\n", msg);
> +    va_list ap;
> +    va_start(ap, fmt);
> +    monitor_vprintf(mon, fmt, ap);
> +    monitor_printf(mon, "\n");
> +    va_end(ap);
>      siglongjmp(expr_env, 1);
>  }
>  
> @@ -3291,7 +3295,7 @@ static int64_t expr_unary(Monitor *mon)
>              expr_error(mon, "number too large");
>          }
>          if (pch == p) {
> -            expr_error(mon, "invalid char in expression");
> +            expr_error(mon, "invalid char '%c' in expression", *p);
>          }
>          pch = p;
>          while (qemu_isspace(*pch))