From nobody Sun Oct 26 04:13:46 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 4cvNYQ2LSqz6Dv6Q; Sun, 26 Oct 2025 04:13:46 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvNYQ1lrdz3Z3X; Sun, 26 Oct 2025 04:13:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761452026; 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=/MHOs9RW9vlYaEo1OmIIpu0MvhJ+4liu1zV6xi34aag=; b=Z0izB5G2mygA3+/zrOMxxlq3qCbEKkHNFnkokIdqcxb0d7lXiRFA8q4tTS0Jq6BWrfDCvr OCjh1UbLpccOqIjgwN3ziD1vpLrQbrEXFX5hP1KaduxZ+P92JmQ8rS6RSFsTPwRW1Clq9k RN3VkmAi3xHnjwQOsOV6PEf0NLRcno3l4UCKtcQn7SzHyH5/scOLLGESdH6mcv+dRE8jcE R7BLgXe5L4ZOa4wGTn3AuLaYf++5IhCXKsTCxi5OoqQJp4v/7oiRTjsL8ngjspHb1OuCTb 7VJWdUecSeMPPVJqPgrWbXIIPD6pgmMRsQJMocYYxZXA/iobG0pjMbHyQgdZbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761452026; 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=/MHOs9RW9vlYaEo1OmIIpu0MvhJ+4liu1zV6xi34aag=; b=DSr/oAjoljVb2XWDVz3Auk9U6k7JACb+VDSVoVHoLxpQ9JoK9V0gr2TgiT9QJ2zFZCV6t6 zBbQM6VnwV++qha6dBwmAYUx8SGkZhwt0If7xx/NpIsimlNLb89ygiVIOtnGpXAD87MeQN 0dEghmCAYJoNONeLaPLyrtAdWL68cYv6IVq7tfexJB8IjDeHvaHgFGE8zWfNPe1x+Dy2Fd 2wbgt6zKCDbV8/BgB6OXVouNJcHVZVX0nYKfmVc4M+Vucx7PUHdCMsG1tBQKFPNC8EG8At q6BATLcGjixtGMjf/zI1UGK1X3wLXQIsio0dEr2zOA3FACK/IVksCasf0fenaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761452026; a=rsa-sha256; cv=none; b=AFsb5HDXANGmpq7AcmZwho2EvbyUKqCD4ZQ65mA4wdfOEBC0yned/KSYE25FJ28UOtHgYA iz80lq2WncluBMBwiBYB91MkUNWGT3cKtWN6Dskzr6be/IWX0LmoVYMPhCuorVsDGcH3Eu YGal8+NEYUaGHeS05/Urwj6cjWd7gih0fjifbjXOfr4WWCTgZTMAC820AN+JT29BYjZSM+ klduDWnVziXY7+Y+8ykOpUQh4tekogi6t1vfbkaLmnyeGwU9jrulKxYhagvvVySEyPE+4N 06SvEl/MO8xioX6RWqJ/QVp/wqR+wbMRYmlW99ZlP9V7NIT+TnXPGXtwlsb9Qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cvNYQ1ChPz2D6; Sun, 26 Oct 2025 04:13:46 +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 59Q4Dk3d077557; Sun, 26 Oct 2025 04:13:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59Q4DkNh077554; Sun, 26 Oct 2025 04:13:46 GMT (envelope-from git) Date: Sun, 26 Oct 2025 04:13:46 GMT Message-Id: <202510260413.59Q4DkNh077554@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 595ddf009a03 - releng/15.0 - inet_net_test: Compare pointers against nullptr 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 595ddf009a0371dfa7fe851349fe79423018259d Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=595ddf009a0371dfa7fe851349fe79423018259d commit 595ddf009a0371dfa7fe851349fe79423018259d Author: John Baldwin AuthorDate: 2025-10-20 18:31:41 +0000 Commit: Colin Percival CommitDate: 2025-10-26 04:13:20 +0000 inet_net_test: Compare pointers against nullptr GCC does not like passing NULL (__null) to std::ostringstream::operator<< inside of ATF_REQUIRE_EQ: lib/libc/tests/net/inet_net_test.cc: In member function 'virtual void {anonymous}::atfu_tc_inet_net_ntop_invalid::body() const': lib/libc/tests/net/inet_net_test.cc:306:9: error: passing NULL to non-pointer argument 1 of 'std::__1::basic_ostream<_CharT, _Traits>& std::__1::basic_ostream<_CharT, _Traits>::operator<<(long int) [with _CharT = char; _Traits = std::__1::char_traits]' [-Werror=conversion-null] 306 | ATF_REQUIRE_EQ(ret, NULL); | ^~~~~~~~~~~~~~ In file included from /usr/obj/.../amd64.amd64/tmp/usr/include/c++/v1/sstream:317, from /usr/obj/.../amd64.amd64/tmp/usr/include/atf-c++/macros.hpp:29, from /usr/obj/.../amd64.amd64/tmp/usr/include/atf-c++.hpp:29, from lib/libc/tests/net/inet_net_test.cc:33: /usr/obj/.../amd64.amd64/tmp/usr/include/c++/v1/__ostream/basic_ostream.h:338:81: note: declared here 338 | basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(long __n) { | ~~~~~^~~ ... Approved by: re (cperciva) Fixes: 8f4a0d2f7b96 ("libc: Import OpenBSD's inet_net_{ntop,pton}") (cherry picked from commit aa358ce3ca8e1fcfb305025fd00beb2a119c7c77) (cherry picked from commit 848ca53d3a44ed58348878de462e4c86daa24e5e) --- lib/libc/tests/net/inet_net_test.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libc/tests/net/inet_net_test.cc b/lib/libc/tests/net/inet_net_test.cc index 4ecf5a3de492..50687cac006a 100644 --- a/lib/libc/tests/net/inet_net_test.cc +++ b/lib/libc/tests/net/inet_net_test.cc @@ -303,25 +303,25 @@ ATF_TEST_CASE_BODY(inet_net_ntop_invalid) std::ranges::fill(strbuf, 'Z'); auto ret = inet_net_ntop(AF_INET6, &addr6, 128, strbuf.data(), 1); - ATF_REQUIRE_EQ(ret, NULL); + ATF_REQUIRE_EQ(ret, nullptr); ATF_REQUIRE_EQ(strbuf[1], 'Z'); std::ranges::fill(strbuf, 'Z'); ret = inet_net_ntop(AF_INET, &addr4, 32, strbuf.data(), 1); - ATF_REQUIRE_EQ(ret, NULL); + ATF_REQUIRE_EQ(ret, nullptr); ATF_REQUIRE_EQ(strbuf[1], 'Z'); /* Check that invalid prefix lengths return an error */ ret = inet_net_ntop(AF_INET6, &addr6, 129, strbuf.data(), strbuf.size()); - ATF_REQUIRE_EQ(ret, NULL); + ATF_REQUIRE_EQ(ret, nullptr); ret = inet_net_ntop(AF_INET6, &addr6, -1, strbuf.data(), strbuf.size()); - ATF_REQUIRE_EQ(ret, NULL); + ATF_REQUIRE_EQ(ret, nullptr); ret = inet_net_ntop(AF_INET, &addr4, 33, strbuf.data(), strbuf.size()); - ATF_REQUIRE_EQ(ret, NULL); + ATF_REQUIRE_EQ(ret, nullptr); ret = inet_net_ntop(AF_INET, &addr4, -1, strbuf.data(), strbuf.size()); - ATF_REQUIRE_EQ(ret, NULL); + ATF_REQUIRE_EQ(ret, nullptr); } ATF_INIT_TEST_CASES(tcs)