From patchwork Fri Oct 12 11:49:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 983007 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42WmNn5H8Lz9s47 for ; Fri, 12 Oct 2018 22:50:17 +1100 (AEDT) Received: from localhost ([::1]:39630 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAvxP-0002vV-7L for incoming@patchwork.ozlabs.org; Fri, 12 Oct 2018 07:50:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36298) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAvwi-0002ud-Ok for qemu-devel@nongnu.org; Fri, 12 Oct 2018 07:49:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAvwh-0008Vf-Qc for qemu-devel@nongnu.org; Fri, 12 Oct 2018 07:49:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59660) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gAvwh-0008SX-BJ for qemu-devel@nongnu.org; Fri, 12 Oct 2018 07:49:31 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AA54064100; Fri, 12 Oct 2018 11:49:30 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-36.ams2.redhat.com [10.36.116.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B8E16F10A; Fri, 12 Oct 2018 11:49:28 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Fri, 12 Oct 2018 13:49:11 +0200 Message-Id: <20181012114916.23532-3-david@redhat.com> In-Reply-To: <20181012114916.23532-1-david@redhat.com> References: <20181012114916.23532-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 12 Oct 2018 11:49:30 +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 v2 2/7] qapi: use qemu_strtoi64() in parse_str_int64 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The qemu api claims to be easier to use, and the resulting code shows that. Signed-off-by: David Hildenbrand --- qapi/string-input-visitor.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c index af0a841152..ee38ab1d10 100644 --- a/qapi/string-input-visitor.c +++ b/qapi/string-input-visitor.c @@ -48,10 +48,10 @@ static void free_range(void *range, void *dummy) static int parse_str_int64(StringInputVisitor *siv, const char *name, Error **errp) { - char *str = (char *) siv->string; - long long start, end; + const char *str = (char *) siv->string; + const char *endptr; + int64_t start, end; Range *cur; - char *endptr; if (siv->ranges) { return 0; @@ -62,9 +62,7 @@ static int parse_str_int64(StringInputVisitor *siv, const char *name, } do { - errno = 0; - start = strtoll(str, &endptr, 0); - if (errno == 0 && endptr > str) { + if (!qemu_strtoi64(str, &endptr, 0, &start)) { if (*endptr == '\0') { cur = g_malloc0(sizeof(*cur)); range_set_bounds(cur, start, start); @@ -73,11 +71,7 @@ static int parse_str_int64(StringInputVisitor *siv, const char *name, str = NULL; } else if (*endptr == '-') { str = endptr + 1; - errno = 0; - end = strtoll(str, &endptr, 0); - if (errno == 0 && endptr > str && start <= end && - (start > INT64_MAX - 65536 || - end < start + 65536)) { + if (!qemu_strtoi64(str, &endptr, 0, &end) && start < end) { if (*endptr == '\0') { cur = g_malloc0(sizeof(*cur)); range_set_bounds(cur, start, end);