From nobody Mon Feb 9 14:34:00 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 1487068114243753.1318958903357; Tue, 14 Feb 2017 02:28:34 -0800 (PST) Received: from localhost ([::1]:33701 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdaLX-0007ki-QI for importer@patchew.org; Tue, 14 Feb 2017 05:28:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38841) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdaJQ-0005r3-Qz for qemu-devel@nongnu.org; Tue, 14 Feb 2017 05:26:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdaJO-0003OZ-68 for qemu-devel@nongnu.org; Tue, 14 Feb 2017 05:26:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35426) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cdaJN-0003NN-Rw for qemu-devel@nongnu.org; Tue, 14 Feb 2017 05:26:18 -0500 Received: from smtp.corp.redhat.com (int-mx16.intmail.prod.int.phx2.redhat.com [10.5.11.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0CC437FB67 for ; Tue, 14 Feb 2017 10:26:18 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-50.ams2.redhat.com [10.36.116.50]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A245CACB8C for ; Tue, 14 Feb 2017 10:26:17 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id B0F7011384BF; Tue, 14 Feb 2017 11:26:11 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 14 Feb 2017 11:26:05 +0100 Message-Id: <1487067971-10443-19-git-send-email-armbru@redhat.com> In-Reply-To: <1487067971-10443-1-git-send-email-armbru@redhat.com> References: <1487067971-10443-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.74 on 10.5.11.28 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 14 Feb 2017 10:26:18 +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 18/24] tests/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_mebi() 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 e28151b..ebef377 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_mebi(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_mebi(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_mebi(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_mebi(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_mebi(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_mebi(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_mebi(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_mebi(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_mebi(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_mebi(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_mebi(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_mebi(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_mebi(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_mebi(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_mebi(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_mebi(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_mebi(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