From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uzoht-0007gT-3E for qemu-devel@nongnu.org; Thu, 18 Jul 2013 09:57:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uzohq-0006fz-8y for qemu-devel@nongnu.org; Thu, 18 Jul 2013 09:57:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45179) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uzohq-0006fq-28 for qemu-devel@nongnu.org; Thu, 18 Jul 2013 09:57:18 -0400 From: Laszlo Ersek Date: Thu, 18 Jul 2013 15:59:22 +0200 Message-Id: <1374155964-11278-5-git-send-email-lersek@redhat.com> In-Reply-To: <1374155964-11278-1-git-send-email-lersek@redhat.com> References: <1374155964-11278-1-git-send-email-lersek@redhat.com> Subject: [Qemu-devel] [RFC 4/6] OptsVisitor: rebase opts_type_uint64() to parse_uint_full() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, pbonzini@redhat.com, gaowanlong@cn.fujitsu.com 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 287aa06..ce6c290 100644 --- a/qapi/opts-visitor.c +++ b/qapi/opts-visitor.c @@ -384,6 +384,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; @@ -394,26 +395,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"); -- 1.7.1