From nobody Mon Oct 20 18:32:13 2025 X-Original-To: dev-commits-src-main@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 4cr3tk0D58z6Ctwm; Mon, 20 Oct 2025 18:32:14 +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 4cr3tj58PVz43qk; Mon, 20 Oct 2025 18:32:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985133; 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=hHUHKZxplxy5U5G8AMonBVKLFdUNdP9ndirIA2Lf1Ys=; b=Og4tMEf72ZSY8B191jPnLDhCSciMGKWf4Mb3W0XMjeWA/cpHz90BPL3MplxBrTEHMxmuAp YzLk8aQkOn7BCXcpUqWJImn/502/BmXt/mcNwwytiUdSaldIiol+nqI5b4w/jZykjWJc0r o3CZgmEYGyjByy9zkBK0JP/x5tTCTaog29jQO1fF0THrGumptEipVNYxltKUuS848RyxZ+ UxGkf/iEl+C9lgwbBi592ITpF6xXzU57m28Xdxj11IM6ZU7S9tL0b1Dauw1Ji0mdlmzVlZ G6T1xHQa+NgdHY8OJdYFKIx/HEZl6M2mYVia4D9ytFq/kqoR5gY75cnMmleD7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985133; 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=hHUHKZxplxy5U5G8AMonBVKLFdUNdP9ndirIA2Lf1Ys=; b=HJ6/KrNBtvynXzm0XUoz8IXve1ReXyj4oo0wP3SORrEf8tCmVx2QogmbHAfPEnH28vON4v SDDOR1wWeGcn9Ut4cOjlh3ky884/r29N3xNhRgd/NkJMy2qx3GLrr8ALZhxdqg15BAe5Ta noBJHyeM4fQ2iMFmeioNmZ7P03vHsLnKAxboingEhiO/xrdkcF2/Flt7EQcM68j38UyASo EKqjYHdSsD22C4BfD/WCQL3slKZuf+Do9bU8rUw/4pTj9GjOZetDqgKcdkZWuGVoSrBdUf Z2qgGVp4Ml6LLyZ6i3zd/oe/R0Bk0TDzdQwhtfNnNreQz579RrT6UCYS04mEXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760985133; a=rsa-sha256; cv=none; b=jw4VZWkk7n/Zi3e34IxHuXcvMl956VYVs3mHW+jbOnNhKgeXEUv0WNlrOvyuAyX/jJBEl/ N84ZF7Wg5km8hTX/fLEErRaqR83TwLmHaoyvsxC5qNg6n4PlSvpipnQ3vaFkGKrYGNlUBY nxoX9g+nwKO6rPfwrva3eHuOElpciFoWH8mc2zHIaWcIok1KJxPVcsP//p3N6wud9PeRLl KhAuYd8HxnPN6rn9tMkMd4itzxuWyDxDyxGNHRSkoG6M/zSdjxDLxgDx8x/K8cpo5vuqqf pKDwR0YQMO//w3NSi3FHi48mldOtL4qx5h7yThrp13cqyDxcfekfuoaoO+jaZQ== 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 4cr3tj4Mvnz8xH; Mon, 20 Oct 2025 18:32:13 +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 59KIWDZk006659; Mon, 20 Oct 2025 18:32:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KIWD3H006656; Mon, 20 Oct 2025 18:32:13 GMT (envelope-from git) Date: Mon, 20 Oct 2025 18:32:13 GMT Message-Id: <202510201832.59KIWD3H006656@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: aa358ce3ca8e - main - inet_net_test: Compare pointers against nullptr List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa358ce3ca8e1fcfb305025fd00beb2a119c7c77 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=aa358ce3ca8e1fcfb305025fd00beb2a119c7c77 commit aa358ce3ca8e1fcfb305025fd00beb2a119c7c77 Author: John Baldwin AuthorDate: 2025-10-20 18:31:41 +0000 Commit: John Baldwin CommitDate: 2025-10-20 18:31:41 +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) { | ~~~~~^~~ ... Fixes: 8f4a0d2f7b96 ("libc: Import OpenBSD's inet_net_{ntop,pton}") --- 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 c4411373165e..60b60b152eca 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)