From patchwork Mon Jul 22 21:07:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 260818 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 B61742C00A3 for ; Tue, 23 Jul 2013 07:44:12 +1000 (EST) Received: from localhost ([::1]:48034 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1Ntq-0003gY-FD for incoming@patchwork.ozlabs.org; Mon, 22 Jul 2013 17:44:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56707) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1NtK-0003ZS-Vx for qemu-devel@nongnu.org; Mon, 22 Jul 2013 17:43:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1NtI-0004br-Fh for qemu-devel@nongnu.org; Mon, 22 Jul 2013 17:43:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21770) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1NIC-0000Ez-8o for qemu-devel@nongnu.org; Mon, 22 Jul 2013 17:05:16 -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 r6ML5F1S005673 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 22 Jul 2013 17:05:15 -0400 Received: from lacos-laptop.usersys.redhat.com (vpn-58-163.rdu2.redhat.com [10.10.58.163]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r6ML59Mk027345 for ; Mon, 22 Jul 2013 17:05:14 -0400 From: Laszlo Ersek To: qemu-devel@nongnu.org Date: Mon, 22 Jul 2013 23:07:32 +0200 Message-Id: <1374527256-27631-5-git-send-email-lersek@redhat.com> In-Reply-To: <1374527256-27631-1-git-send-email-lersek@redhat.com> References: <1374527256-27631-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/8] 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 Simplify the code in preparation for the next patch. Signed-off-by: Laszlo Ersek --- qapi/opts-visitor.c | 23 +++++------------------ 1 files 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");