From nobody Thu Aug 7 09:34:44 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4byMSj1SDhz642ZR; Thu, 07 Aug 2025 09:34:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4byMSj0Jmlz3XZK; Thu, 07 Aug 2025 09:34:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754559285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WB0Mq8eMzLQeovFWIvrrccTMQHDXS+hxRYhXq8sWjrk=; b=lsxof8HwJ8bRLTpb8hTLLxINOWdcGWme3qgnTRrgbt2SpOKV0FDlT+HjkiJQpUqieMPvPx Ix3ZsFAtAaCnj+RpqjR1h23aEc1R0xJxBlvCTAuyBnsWzHA40YxmWnLsDPRbQ1qvK1Hz3Q z5QsZalWwddAUjajYKU7LSsKUBlCKfS2DIiwWQyupSGkxKFMjvPvYYxFHzdN/u4cjIarXj TLQhrxlwxDTl/fXNfZ5ClS1ZM11R+qlJfSr62wvwfIvlNvPNU0vH6CQ4ECydr2+erAigil AhgBBlcuNEmIFmWl2rExX07QMoKkSV6ivWcx0LMaLXkv1fd0XP8WVmex6FRt+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754559285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WB0Mq8eMzLQeovFWIvrrccTMQHDXS+hxRYhXq8sWjrk=; b=ejMhUOD9LAIXBxq5+l+/zQ2um1jTD0mrAurYyt7wq0vCSlAV9+Mvgq6bbnwJZQRztXEsa/ G88AVEOhhzSxgYlaoZzrNtRxmqOSbqj/FLxy0MDL+GxBuL2oYrMlzH8R2kRDdVp7zhNn4Q aP0yw3odpzMQnLSRkIqyFoxy+Qrcq4jAEdQb8lJHAmlLf6Un9kn2b0pyjpRjOiHMIWzc8p 6cGB77cw1sd/1K7jLazk33M1pglZfWuQ6cfrVfZ4SYU8widOeyp/BQr+UFjAbgNblOp4+O rfOgoWpNsas4z3nDY4tZLIrg1yEysnZZS+lpMeIXM8P1iiWnM4QTOWybpKeh1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754559285; a=rsa-sha256; cv=none; b=acqBAexqdk0iAyVd5AlbVc01mpS7CZFYJD2oPREchldM9eaon/UUN5XitFV1ua3HywGeT2 m4gAMOI3sidyXZGTgo+JfXYpS/Re+pmZt30q2FZKoe7URN55C0Cu0Jc6nF0Kvy7GgEDsLu phW1pOb9VGexzXEdWkOPv+XSKqjsc2yV7oWdBu9W8QIkSXS/bM3oLay2v7lrtpz20uwkYc 7EfpbMKaLyU14xE7aoUrodc1ul+Y3cH1yY/x82J0jNMorO8fjGY/5XKJk+dnRx6nDwygDz UE8mjFx/Ow27P/XipGVVYD0vjYxXF5ULWWpapm6bZFhNJjH+C+swQ7d9YM/5cA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4byMSh6vGvz117F; Thu, 07 Aug 2025 09:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5779YiOP084724; Thu, 7 Aug 2025 09:34:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5779Yi7Y084721; Thu, 7 Aug 2025 09:34:44 GMT (envelope-from git) Date: Thu, 7 Aug 2025 09:34:44 GMT Message-Id: <202508070934.5779Yi7Y084721@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: bd953a6026fc - main - libutil: Fix 32-bit build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd953a6026fce63b0a76a01da1812e51f630f797 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=bd953a6026fce63b0a76a01da1812e51f630f797 commit bd953a6026fce63b0a76a01da1812e51f630f797 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-07 09:31:25 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-07 09:34:13 +0000 libutil: Fix 32-bit build In the expand_generic test case for expand_number(), leave out size_t if it's not 64 bits wide. Fixes: ab1c6874e500 --- lib/libutil/tests/expand_number_test.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libutil/tests/expand_number_test.c b/lib/libutil/tests/expand_number_test.c index 8ff56e1ed01f..9bd339298575 100644 --- a/lib/libutil/tests/expand_number_test.c +++ b/lib/libutil/tests/expand_number_test.c @@ -251,7 +251,9 @@ ATF_TC_BODY(expand_generic, tp) { uint64_t uint64; int64_t int64; +#ifdef __LP64__ size_t size; +#endif off_t off; ATF_REQUIRE_EQ(0, expand_number("18446744073709551615", &uint64)); @@ -266,10 +268,12 @@ ATF_TC_BODY(expand_generic, tp) ATF_REQUIRE_EQ(0, expand_number("-9223372036854775808", &int64)); ATF_REQUIRE_EQ(INT64_MIN, int64); +#ifdef __LP64__ ATF_REQUIRE_EQ(0, expand_number("18446744073709551615", &size)); ATF_REQUIRE_EQ(UINT64_MAX, size); ATF_REQUIRE_EQ(-1, expand_number("-1", &size)); ATF_REQUIRE_EQ(ERANGE, errno); +#endif ATF_REQUIRE_EQ(0, expand_number("9223372036854775807", &off)); ATF_REQUIRE_EQ(INT64_MAX, off);