From nobody Tue Feb 10 15:28:13 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1576674365; cv=none; d=zohomail.com; s=zohoarc; b=dAbGGoe+AnyOHeFgSnZU+1+EgShjJLzer2yOlHPK60zSV6TRWEXxuu3oSwJvDD0QdXMGv2p9GS1qUbr3CiTQNFvq6F1iDINE4ulAkQM5g0rVLQBxAuxJVggJd/lQr6DCV5aSik/LzTXWa6YfmDGnTRuHBGmiiMpzUACGBEYx6Mc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576674365; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EHCHNbVEL4It3g1M0cmLBUIwKe12UfdfnloEx95fbQs=; b=PGRO49TD3f6QMSpszdM/nBYnmmurNSGdH9d4NOV5wqS74T9axRDQ7AOqvLSj05HAoIYN/Ehz8ykqmACkdv2jm+SSfROhI8jY/M6M9IXl6eozo8yYSrCttoR66t7jNBOM4jisw/7H2IW/A2rZTlue/boi4V2fyaN8FAF0fydH22k= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576674365666770.262658968985; Wed, 18 Dec 2019 05:06:05 -0800 (PST) Received: from localhost ([::1]:53990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihZ1f-0007Yu-0J for importer@patchew.org; Wed, 18 Dec 2019 08:06:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52190) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihYx2-0001sB-6h for qemu-devel@nongnu.org; Wed, 18 Dec 2019 08:01:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihYx0-0007iN-V9 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 08:01:16 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:36705) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ihYx0-0007bd-IX; Wed, 18 Dec 2019 08:01:14 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M2Nm2-1ifvK72kxS-003v1g; Wed, 18 Dec 2019 14:01:09 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 3/7] util/cutils: Turn FIXME comment into QEMU_BUILD_BUG_ON() Date: Wed, 18 Dec 2019 14:01:01 +0100 Message-Id: <20191218130105.125981-4-laurent@vivier.eu> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191218130105.125981-1-laurent@vivier.eu> References: <20191218130105.125981-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:Z6qpvgpRgK83bqqxGDdS0W/GT+hXJdPgM7idN7ExVcjSrrL//C2 tn5OhPvbociww0aXhH4Pf5bXN5KhtRWHc/XxB/+PpVaV+HR7mf6IYuF8HbhOKdohsvmC04J MQFOGwfr0u+Pc9MUGjdOfI6cFJwg54pv79YxwY+AE/p08+W8Y08Jfj5vwHg0YcJJDA4AvFl Mgewp8i1DTbm9c4Hsz4Zg== X-UI-Out-Filterresults: notjunk:1;V03:K0:zcLUXBW2HKA=:kpjk1LjmQDFmlvqAOhgqpb 1qdYQf7rnTmTxhMbbFEPw4Q5y3b2J4xuqpp/W3zz0voxrik2vy+llwQX+R67hhsbOG+sSqoQd dSb4AdFvTWEomCrj/ybc8RUgv4dbDiqlPWmdNb7hMFyjj+ycDdWn9wLrsHodi1YbmfCFhzcyg zl2iC2IPje4h8bl4WY7ieWhDUCosnoY4HPJ1HLtjLKtQVNSaDCY2Nieed9xdA546/oqPRFIph WlBCAjBqEh6l9on3ngnmsHF6bSeQ/TXX1/wiIUEwg+qD2qZ612/5jQ8fyzJJmgubnBZ46NTdF g4jLxR1nDe/QtW3/3bHTm1753DvDCglPzrcIKyBu4UGz5QCNtJ9gAyuQnq/28JH6D1EDULj5S L0XZYtwUTxBtdOufmbaTNclf0A6rckUXVBo9teAGbyNCwQ7HYWfCsqr3boDmwY2urFuVu8C5t xsJTZ5ub/8hfvP5p5sFudcwD338UmfqYGVcKz0qpiXYanZ+IA9dscBQ40VzqmzygDc1O4YQSK PHR+YFoOq1q9WaIneZl0yAVhp4bJ0YfvkddrsLhBOnHZSku/7BD2VByRmypuztyZYV2+utG35 aYaKSxmXL1Hkrx6CSzIlnK8f5Wyc0IX/GvWUFylgDNXTTNKaQi0JPC6MnQGKsDiaZmwObdDef CRCERRAyJI7MCSlu0ycLJzDz2AcS5/Fgk67zew6NGpLvzpMDKPo164SGEXoCVLnAXZBjHlY+H +oGfikhEjVEtpajeghT+Tg31S+p1/M1jeuj4tw4d0tnzk/5yJwqpvspVABj1va10+umYbK+lS YladQckGLYMvlOHCZDfyabZq88a5S6NK41dsel5+5KC/1Z44xFiB0KBSZDlUPPY+U2agSNXQo lM75J6ZXT/rInm9SYsjSBuuDW26smvYKTg3EphjeE= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Markus Armbruster , Michael Tokarev , Laurent Vivier , "Dr. David Alan Gilbert" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Markus Armbruster qemu_strtoi64() assumes int64_t is long long. This is marked FIXME. Replace by a QEMU_BUILD_BUG_ON() to avoid surprises. Same for qemu_strtou64(). Fix a typo in qemu_strtoul()'s contract while there. Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20191125133846.27790-2-armbru@redhat.com> [lv: removed trailing whitespace] Signed-off-by: Laurent Vivier --- util/cutils.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/util/cutils.c b/util/cutils.c index 238016523039..36ce712271f1 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -542,7 +542,7 @@ int qemu_strtoul(const char *nptr, const char **endptr,= int base, * Convert string @nptr to an int64_t. * * Works like qemu_strtol(), except it stores INT64_MAX on overflow, - * and INT_MIN on underflow. + * and INT64_MIN on underflow. */ int qemu_strtoi64(const char *nptr, const char **endptr, int base, int64_t *result) @@ -557,8 +557,9 @@ int qemu_strtoi64(const char *nptr, const char **endptr= , int base, return -EINVAL; } =20 + /* This assumes int64_t is long long TODO relax */ + QEMU_BUILD_BUG_ON(sizeof(int64_t) !=3D sizeof(long long)); errno =3D 0; - /* FIXME This assumes int64_t is long long */ *result =3D strtoll(nptr, &ep, base); return check_strtox_error(nptr, ep, endptr, errno); } @@ -581,8 +582,9 @@ int qemu_strtou64(const char *nptr, const char **endptr= , int base, return -EINVAL; } =20 + /* This assumes uint64_t is unsigned long long TODO relax */ + QEMU_BUILD_BUG_ON(sizeof(uint64_t) !=3D sizeof(unsigned long long)); errno =3D 0; - /* FIXME This assumes uint64_t is unsigned long long */ *result =3D strtoull(nptr, &ep, base); /* Windows returns 1 for negative out-of-range values. */ if (errno =3D=3D ERANGE) { --=20 2.24.1