From nobody Thu Nov 6 10:13:56 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1540310710934970.4509504708475; Tue, 23 Oct 2018 09:05:10 -0700 (PDT) Received: from localhost ([::1]:42940 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEzB7-0000VJ-PE for importer@patchew.org; Tue, 23 Oct 2018 12:05:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEyht-0007NI-M3 for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:34:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gEyWl-0001P9-WB for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:23:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37670) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gEyWi-0001LN-CC for qemu-devel@nongnu.org; Tue, 23 Oct 2018 11:23:27 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 369923082143; Tue, 23 Oct 2018 15:23:20 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-206.ams2.redhat.com [10.36.116.206]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB727604DD; Tue, 23 Oct 2018 15:23:17 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Tue, 23 Oct 2018 17:23:00 +0200 Message-Id: <20181023152306.3123-2-david@redhat.com> In-Reply-To: <20181023152306.3123-1-david@redhat.com> References: <20181023152306.3123-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 23 Oct 2018 15:23:20 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 1/7] qapi: use qemu_strtoi64() in parse_str X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , "Michael S . Tsirkin" , David Hildenbrand , Michael Roth , Markus Armbruster , Igor Mammedov , "Dr . David Alan Gilbert" , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The qemu api claims to be easier to use, and the resulting code seems to agree. Signed-off-by: David Hildenbrand Reviewed-by: David Gibson --- qapi/string-input-visitor.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c index b3fdd0827d..c1454f999f 100644 --- a/qapi/string-input-visitor.c +++ b/qapi/string-input-visitor.c @@ -20,6 +20,7 @@ #include "qemu/option.h" #include "qemu/queue.h" #include "qemu/range.h" +#include "qemu/cutils.h" =20 =20 struct StringInputVisitor @@ -46,10 +47,10 @@ static void free_range(void *range, void *dummy) =20 static int parse_str(StringInputVisitor *siv, const char *name, Error **er= rp) { - char *str =3D (char *) siv->string; - long long start, end; + const char *str =3D (char *) siv->string; + const char *endptr; + int64_t start, end; Range *cur; - char *endptr; =20 if (siv->ranges) { return 0; @@ -60,9 +61,7 @@ static int parse_str(StringInputVisitor *siv, const char = *name, Error **errp) } =20 do { - errno =3D 0; - start =3D strtoll(str, &endptr, 0); - if (errno =3D=3D 0 && endptr > str) { + if (!qemu_strtoi64(str, &endptr, 0, &start)) { if (*endptr =3D=3D '\0') { cur =3D g_malloc0(sizeof(*cur)); range_set_bounds(cur, start, start); @@ -71,11 +70,7 @@ static int parse_str(StringInputVisitor *siv, const char= *name, Error **errp) str =3D NULL; } else if (*endptr =3D=3D '-') { str =3D endptr + 1; - errno =3D 0; - end =3D strtoll(str, &endptr, 0); - if (errno =3D=3D 0 && endptr > str && start <=3D end && - (start > INT64_MAX - 65536 || - end < start + 65536)) { + if (!qemu_strtoi64(str, &endptr, 0, &end) && start < end) { if (*endptr =3D=3D '\0') { cur =3D g_malloc0(sizeof(*cur)); range_set_bounds(cur, start, end); --=20 2.17.1