From nobody Mon Feb 9 12:10:27 2026 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487709334098113.78191176572363; Tue, 21 Feb 2017 12:35:34 -0800 (PST) Received: from localhost ([::1]:48369 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgH9l-0001nM-98 for importer@patchew.org; Tue, 21 Feb 2017 15:35:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55156) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgGpG-0007Qa-4P for qemu-devel@nongnu.org; Tue, 21 Feb 2017 15:14:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cgGpC-0008WM-OX for qemu-devel@nongnu.org; Tue, 21 Feb 2017 15:14:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49706) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cgGpC-0008V8-FN for qemu-devel@nongnu.org; Tue, 21 Feb 2017 15:14:14 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B109C81127 for ; Tue, 21 Feb 2017 20:14:14 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-55.ams2.redhat.com [10.36.116.55]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1LKEDdG014927 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 21 Feb 2017 15:14:14 -0500 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 575371138616; Tue, 21 Feb 2017 21:14:08 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 21 Feb 2017 21:14:02 +0100 Message-Id: <1487708048-2131-19-git-send-email-armbru@redhat.com> In-Reply-To: <1487708048-2131-1-git-send-email-armbru@redhat.com> References: <1487708048-2131-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 21 Feb 2017 20:14:14 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 18/24] test-cutils: Use qemu_strtosz() more often 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use qemu_strtosz() instead of qemu_strtosz_MiB() where it doesn't really make a difference. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- tests/test-cutils.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/test-cutils.c b/tests/test-cutils.c index 9eae067..d492d1e 100644 --- a/tests/test-cutils.c +++ b/tests/test-cutils.c @@ -1376,16 +1376,16 @@ static void test_qemu_strtosz_simple(void) int64_t res; =20 str =3D "0"; - res =3D qemu_strtosz_MiB(str, &endptr); + res =3D qemu_strtosz(str, &endptr); g_assert_cmpint(res, =3D=3D, 0); g_assert(endptr =3D=3D str + 1); =20 str =3D "12345M"; - res =3D qemu_strtosz_MiB(str, &endptr); + res =3D qemu_strtosz(str, &endptr); g_assert_cmpint(res, =3D=3D, 12345 * M_BYTE); g_assert(endptr =3D=3D str + 6); =20 - res =3D qemu_strtosz_MiB(str, NULL); + res =3D qemu_strtosz(str, NULL); g_assert_cmpint(res, =3D=3D, 12345 * M_BYTE); =20 /* Note: precision is 53 bits since we're parsing with strtod() */ @@ -1437,31 +1437,31 @@ static void test_qemu_strtosz_units(void) g_assert_cmpint(res, =3D=3D, M_BYTE); g_assert(endptr =3D=3D none + 1); =20 - res =3D qemu_strtosz_MiB(b, &endptr); + res =3D qemu_strtosz(b, &endptr); g_assert_cmpint(res, =3D=3D, 1); g_assert(endptr =3D=3D b + 2); =20 - res =3D qemu_strtosz_MiB(k, &endptr); + res =3D qemu_strtosz(k, &endptr); g_assert_cmpint(res, =3D=3D, K_BYTE); g_assert(endptr =3D=3D k + 2); =20 - res =3D qemu_strtosz_MiB(m, &endptr); + res =3D qemu_strtosz(m, &endptr); g_assert_cmpint(res, =3D=3D, M_BYTE); g_assert(endptr =3D=3D m + 2); =20 - res =3D qemu_strtosz_MiB(g, &endptr); + res =3D qemu_strtosz(g, &endptr); g_assert_cmpint(res, =3D=3D, G_BYTE); g_assert(endptr =3D=3D g + 2); =20 - res =3D qemu_strtosz_MiB(t, &endptr); + res =3D qemu_strtosz(t, &endptr); g_assert_cmpint(res, =3D=3D, T_BYTE); g_assert(endptr =3D=3D t + 2); =20 - res =3D qemu_strtosz_MiB(p, &endptr); + res =3D qemu_strtosz(p, &endptr); g_assert_cmpint(res, =3D=3D, P_BYTE); g_assert(endptr =3D=3D p + 2); =20 - res =3D qemu_strtosz_MiB(e, &endptr); + res =3D qemu_strtosz(e, &endptr); g_assert_cmpint(res, =3D=3D, E_BYTE); g_assert(endptr =3D=3D e + 2); } @@ -1472,7 +1472,7 @@ static void test_qemu_strtosz_float(void) char *endptr =3D NULL; int64_t res; =20 - res =3D qemu_strtosz_MiB(str, &endptr); + res =3D qemu_strtosz(str, &endptr); g_assert_cmpint(res, =3D=3D, 12.345 * M_BYTE); g_assert(endptr =3D=3D str + 7); } @@ -1484,17 +1484,17 @@ static void test_qemu_strtosz_invalid(void) int64_t res; =20 str =3D ""; - res =3D qemu_strtosz_MiB(str, &endptr); + res =3D qemu_strtosz(str, &endptr); g_assert_cmpint(res, =3D=3D, -EINVAL); g_assert(endptr =3D=3D str); =20 str =3D " \t "; - res =3D qemu_strtosz_MiB(str, &endptr); + res =3D qemu_strtosz(str, &endptr); g_assert_cmpint(res, =3D=3D, -EINVAL); g_assert(endptr =3D=3D str); =20 str =3D "crap"; - res =3D qemu_strtosz_MiB(str, &endptr); + res =3D qemu_strtosz(str, &endptr); g_assert_cmpint(res, =3D=3D, -EINVAL); g_assert(endptr =3D=3D str); } @@ -1511,7 +1511,7 @@ static void test_qemu_strtosz_trailing(void) g_assert(endptr =3D=3D str + 3); =20 str =3D "1kiB"; - res =3D qemu_strtosz_MiB(str, &endptr); + res =3D qemu_strtosz(str, &endptr); g_assert_cmpint(res, =3D=3D, 1024); g_assert(endptr =3D=3D str + 2); } @@ -1523,7 +1523,7 @@ static void test_qemu_strtosz_erange(void) int64_t res; =20 str =3D "-1"; - res =3D qemu_strtosz_MiB(str, &endptr); + res =3D qemu_strtosz(str, &endptr); g_assert_cmpint(res, =3D=3D, -ERANGE); g_assert(endptr =3D=3D str + 2); =20 @@ -1543,7 +1543,7 @@ static void test_qemu_strtosz_erange(void) g_assert(endptr =3D=3D str + 19); =20 str =3D "10E"; - res =3D qemu_strtosz_MiB(str, &endptr); + res =3D qemu_strtosz(str, &endptr); g_assert_cmpint(res, =3D=3D, -ERANGE); g_assert(endptr =3D=3D str + 3); } --=20 2.7.4