From patchwork Tue Aug 20 16:10:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 268624 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D753F2C010A for ; Wed, 21 Aug 2013 02:43:57 +1000 (EST) Received: from localhost ([::1]:48852 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBoYd-0003mb-AT for incoming@patchwork.ozlabs.org; Tue, 20 Aug 2013 12:13:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43210) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBoWF-0008AS-1n for qemu-devel@nongnu.org; Tue, 20 Aug 2013 12:11:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VBoWA-0002UU-EO for qemu-devel@nongnu.org; Tue, 20 Aug 2013 12:10:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18491) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBoWA-0002UB-53 for qemu-devel@nongnu.org; Tue, 20 Aug 2013 12:10:50 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r7KGAmHi019347 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 20 Aug 2013 12:10:48 -0400 Received: from localhost (ovpn-113-96.phx2.redhat.com [10.3.113.96]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r7KGAlce020488; Tue, 20 Aug 2013 12:10:48 -0400 From: Luiz Capitulino To: anthony@codemonkey.ws Date: Tue, 20 Aug 2013 12:10:35 -0400 Message-Id: <1377015041-6567-6-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1377015041-6567-1-git-send-email-lcapitulino@redhat.com> References: <1377015041-6567-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 05/11] OptsVisitor: rebase opts_type_uint64() to parse_uint_full() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Laszlo Ersek Simplify the code in preparation for the next patch. Signed-off-by: Laszlo Ersek Tested-by: Wanlong Gao Signed-off-by: Luiz Capitulino --- qapi/opts-visitor.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c index 90be583..d8f9a0e 100644 --- a/qapi/opts-visitor.c +++ b/qapi/opts-visitor.c @@ -407,6 +407,7 @@ opts_type_uint64(Visitor *v, uint64_t *obj, const char *name, Error **errp) OptsVisitor *ov = DO_UPCAST(OptsVisitor, visitor, v); const QemuOpt *opt; const char *str; + unsigned long long val; if (ov->list_mode == LM_UNSIGNED_INTERVAL) { *obj = ov->range_next.u; @@ -417,26 +418,12 @@ opts_type_uint64(Visitor *v, uint64_t *obj, const char *name, Error **errp) if (!opt) { return; } - str = opt->str; - if (str != NULL) { - while (isspace((unsigned char)*str)) { - ++str; - } - - if (*str != '-' && *str != '\0') { - unsigned long long val; - char *endptr; - /* non-empty, non-negative subject sequence */ - errno = 0; - val = strtoull(str, &endptr, 0); - if (*endptr == '\0' && errno == 0 && val <= UINT64_MAX) { - *obj = val; - processed(ov, name); - return; - } - } + if (parse_uint_full(str, &val, 0) == 0 && val <= UINT64_MAX) { + *obj = val; + processed(ov, name); + return; } error_set(errp, QERR_INVALID_PARAMETER_VALUE, opt->name, "an uint64 value");