From nobody Sun Feb 8 23:05:02 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 1487708796214172.04143622348977; Tue, 21 Feb 2017 12:26:36 -0800 (PST) Received: from localhost ([::1]:48329 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgH17-0001Cu-Os for importer@patchew.org; Tue, 21 Feb 2017 15:26:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55074) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgGpD-0007Ps-UX for qemu-devel@nongnu.org; Tue, 21 Feb 2017 15:14:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cgGpC-0008Vk-KA for qemu-devel@nongnu.org; Tue, 21 Feb 2017 15:14:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40104) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cgGpC-0008Uz-9V 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 881104DD4B 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 v1LKEDqe014926 (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 5476E1138613; Tue, 21 Feb 2017 21:14:08 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 21 Feb 2017 21:14:01 +0100 Message-Id: <1487708048-2131-18-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> MIME-Version: 1.0 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.38]); Tue, 21 Feb 2017 20:14:14 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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 17/24] util/cutils: Drop QEMU_STRTOSZ_DEFSUFFIX_* macros 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-Type: text/plain; charset="utf-8" Writing QEMU_STRTOSZ_DEFSUFFIX_* instead of '*' gains nothing. Get rid of these eyesores. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- util/cutils.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/util/cutils.c b/util/cutils.c index 97ec130..0ac8019 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -178,30 +178,22 @@ int fcntl_setfl(int fd, int flag) } #endif =20 -#define QEMU_STRTOSZ_DEFSUFFIX_EB 'E' -#define QEMU_STRTOSZ_DEFSUFFIX_PB 'P' -#define QEMU_STRTOSZ_DEFSUFFIX_TB 'T' -#define QEMU_STRTOSZ_DEFSUFFIX_GB 'G' -#define QEMU_STRTOSZ_DEFSUFFIX_MB 'M' -#define QEMU_STRTOSZ_DEFSUFFIX_KB 'K' -#define QEMU_STRTOSZ_DEFSUFFIX_B 'B' - static int64_t suffix_mul(char suffix, int64_t unit) { switch (qemu_toupper(suffix)) { - case QEMU_STRTOSZ_DEFSUFFIX_B: + case 'B': return 1; - case QEMU_STRTOSZ_DEFSUFFIX_KB: + case 'K': return unit; - case QEMU_STRTOSZ_DEFSUFFIX_MB: + case 'M': return unit * unit; - case QEMU_STRTOSZ_DEFSUFFIX_GB: + case 'G': return unit * unit * unit; - case QEMU_STRTOSZ_DEFSUFFIX_TB: + case 'T': return unit * unit * unit * unit; - case QEMU_STRTOSZ_DEFSUFFIX_PB: + case 'P': return unit * unit * unit * unit * unit; - case QEMU_STRTOSZ_DEFSUFFIX_EB: + case 'E': return unit * unit * unit * unit * unit * unit; } return -1; @@ -258,17 +250,17 @@ fail: =20 int64_t qemu_strtosz(const char *nptr, char **end) { - return do_strtosz(nptr, end, QEMU_STRTOSZ_DEFSUFFIX_B, 1024); + return do_strtosz(nptr, end, 'B', 1024); } =20 int64_t qemu_strtosz_MiB(const char *nptr, char **end) { - return do_strtosz(nptr, end, QEMU_STRTOSZ_DEFSUFFIX_MB, 1024); + return do_strtosz(nptr, end, 'M', 1024); } =20 int64_t qemu_strtosz_metric(const char *nptr, char **end) { - return do_strtosz(nptr, end, QEMU_STRTOSZ_DEFSUFFIX_B, 1000); + return do_strtosz(nptr, end, 'B', 1000); } =20 /** --=20 2.7.4