From nobody Sun Oct 26 02:36:34 2025 X-Original-To: dev-commits-src-branches@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 4cvLPG44zSz6Dj07; Sun, 26 Oct 2025 02:36:34 +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 4cvLPG2nXTz3Ks9; Sun, 26 Oct 2025 02:36:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761446194; 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=UnD2Hgu4Zukwqo9aOzvBDSE8BEJ+IK+nLqn63IWlE4M=; b=SFSrBdl8kOG8kjTfNyRvEPcTrUlclJlnHZ+HahCUPtImqg6hcYaXMqZ0PmGLXYmQsaWQU6 AT7IbH2tAwofomf5XEl1xGQMgQUhJRvUGOQ3qcDvLNPzid/G87jbrh4yFneI14Es65ene/ 1e3Rni90eoQDCS1VNcpCULAvDIGXp36XzIW40srnriDHCx8Yufk6Z+9c1/FOXDYGIW5Ne9 uyRLbvbh6lO1yQDuwTgcxzH6MWI6AaJ7Yc2V3msvqwCjXBred/miKvCwVf+5AnoFUJy9Xf npoDrkP5GuODGCvjBKUo1DBB+Ui4OOKHI0i6zoUXfUdkJf9cJ6kae1B+yyhUlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761446194; 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=UnD2Hgu4Zukwqo9aOzvBDSE8BEJ+IK+nLqn63IWlE4M=; b=wwRe84paBSuaxitgqG5alCFDMQE0JFixoee3nTyP2Px1aANpexXV+LGBJIuufybcu4DEit 7iv+lfihiphutD3IH+Aejct8g0PLhKgeMryU2hBAinzSOO8JJvPXaU+0EZwNavTZSKzqQP h4E+gfp+l21cixt/9N2Tw/t2xGYDMl9IO6vM+nc3DhLytpe8W7Qz3BSU0tjK8ok6EUEt3T lfyg8d7ovriUqiHwTB7EKdxAGptki5jwFOkAXtVxWo1dLKftYVHu5aSmWaPbmuNJ6KF6am VPPGKB8NSukuPaC4MnQXripAVt8sthNWn15FCAgBEB+FlBJTGFFEjlTkf2vVPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761446194; a=rsa-sha256; cv=none; b=OqVKOLHXqo2ZoUFwPRLjXJ2juznyQRthQMtEC2Gv8QmRaEAD9y3BS/etif8P1r69I7hzxM nQqsfHl1P3aos92468WjHnmvlgkF/UYx8tiSOS+6tPTBUZuHR3qWT5yXLGOiQrvOBc2Jbc tcgJCEM+IID5MTkNAUmh6bnfjgR/lUBpUPeyWMdFetAz8k0zXkR/bKgWMwSOQ+HbSMokmq sTqStlV9FBcS//CANSraSO3Dia5IakFXkLYBwOfr4xHh1/8i4tZi9jqRiVNN+r9lU6Eyj0 Sxp6JgXgCFwuN7i/P7KcQkZ8sttURa9z9ebyXBsCb8VKjZ4FnD/8uOPa//uraw== 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 4cvLPG2Lnjz1CnW; Sun, 26 Oct 2025 02:36:34 +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 59Q2aYKV087291; Sun, 26 Oct 2025 02:36:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59Q2aYlj087288; Sun, 26 Oct 2025 02:36:34 GMT (envelope-from git) Date: Sun, 26 Oct 2025 02:36:34 GMT Message-Id: <202510260236.59Q2aYlj087288@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 848ca53d3a44 - stable/15 - inet_net_test: Compare pointers against nullptr List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 848ca53d3a44ed58348878de462e4c86daa24e5e Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=848ca53d3a44ed58348878de462e4c86daa24e5e commit 848ca53d3a44ed58348878de462e4c86daa24e5e Author: John Baldwin AuthorDate: 2025-10-20 18:31:41 +0000 Commit: Lexi Winter CommitDate: 2025-10-26 02:30:05 +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}") (cherry picked from commit aa358ce3ca8e1fcfb305025fd00beb2a119c7c77) --- 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)