From nobody Sat May 3 15:59:15 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 4ZqXXg70dKz5vWwT; Sat, 03 May 2025 15:59:15 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZqXXg4rctz3sHl; Sat, 03 May 2025 15:59:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746287955; 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=6c1wJBrLv7h4MbMUMl0v/+3mwRTFb07QX8dhv+dN39E=; b=Go7o3NgwH9AD/OXU0C4GOiRfQwsJvAdRsNv0ZyJJuCWmbJ0LLdgpzGvcGP6ywQqziIaB+A 9hbpEjyYchZb6J1gB935XSavCQdUOjkpDnU5CIqCaOiaILB7mcRdtdt1eXzXL7B+8IavOW ALBUuqOgzE0ftSNeg6+kDaJXxgCb7AoDuwRnBa5JYbrN1YML3r3He+y1qandrf3yjU23CR AMdIsNT6qRmrqZHeNQcbvjfWjaJP0TgTxs6ZjL2tI5eQjGUt4LG8rMgQoPEWyncIIQT/dt OT7cG0CFWpoTaLuZJj5ie+aRMSuel3DIl4g+zbLhvuoFlHHCbzmbMi+I3D2PjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746287955; 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=6c1wJBrLv7h4MbMUMl0v/+3mwRTFb07QX8dhv+dN39E=; b=lh6sMHWevB2gldQtNdnW7ZXS5G8RS4WeNmc0/3a9m7vAO9bdsmE3uFgNwgLTDoBHC7HjKo N2pXkEFWMchMNaDRrO94HLedpTLW6A0XvRV9PAb+NwIpCXoP9ESYvWjEZKgf3Ai7NpYMEg PunNLhL5aCZIr8zHQIS5cH/w15KWyIHjXbgwFOu+t6KaQHrtPGLMZrB2dz/CANpwXwX3Mr nDjwvdbRcR8IHq06Q1CCWYn1dl/asFgxquq2h7a/81D2oV8k0+bmxhRDj3nwq8Hfy8O/Lv lRX3mj6W5EljrcF0BGA/Iys6eDvy4k8T1tusD+3Opt3h5gaZ7N+GMwJbhOlrtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746287955; a=rsa-sha256; cv=none; b=f+6FG0Woi6KiXigySoYZD5t2Lv4CrDfy8BBvgelC9u3s4PQ5JlW4BIjjNPmsaQMYDBsYP4 zE6N7qgZp/Giu8uUbc6h76UDqosDSuqrmqYBsluLORFjRU51S8vb7dtuwbbI6R2gTwZea0 2C6xzW87Jd+p/hLmUrEuRV2r0XTId3wDPPteasWx0bO+uPZvlK8F+AQ+6LMhF1XEmIYrXa 1M2XsZ4IjUNMrbO8fGgB4ljPEWOtVN0ITUd48uu5RCpEHCIhzwAdyOyXJLxtFfDe5JpvMd IRp9JaIlY6xfdMRwIJkMCMYhEhC7M4w5rvcnUBYnwbwM941dRX0tsaqESdXk+A== 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 4ZqXXg4FQqzpdx; Sat, 03 May 2025 15:59:15 +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 543FxFDU021114; Sat, 3 May 2025 15:59:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 543FxFOi021111; Sat, 3 May 2025 15:59:15 GMT (envelope-from git) Date: Sat, 3 May 2025 15:59:15 GMT Message-Id: <202505031559.543FxFOi021111@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: d61c8bca8648 - main - kyua: Don't pass NULL to std::unique_ptr<>::reset() 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: d61c8bca8648fa6dfa89bd5c7dc75726a2740c15 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d61c8bca8648fa6dfa89bd5c7dc75726a2740c15 commit d61c8bca8648fa6dfa89bd5c7dc75726a2740c15 Author: John Baldwin AuthorDate: 2025-05-03 15:59:02 +0000 Commit: John Baldwin CommitDate: 2025-05-03 15:59:02 +0000 kyua: Don't pass NULL to std::unique_ptr<>::reset() No functional change, this is simply more idiomatic. Reviewed by: olce, emaste Differential Revision: https://reviews.freebsd.org/D50091 --- contrib/kyua/utils/fs/directory.cpp | 2 +- contrib/kyua/utils/logging/operations.cpp | 2 +- contrib/kyua/utils/process/child.cpp | 10 +++++----- contrib/kyua/utils/process/executor.cpp | 4 ++-- contrib/kyua/utils/signals/interrupts.cpp | 6 +++--- contrib/kyua/utils/signals/timer.cpp | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/contrib/kyua/utils/fs/directory.cpp b/contrib/kyua/utils/fs/directory.cpp index c8cd5e008490..f82fe88f86dc 100644 --- a/contrib/kyua/utils/fs/directory.cpp +++ b/contrib/kyua/utils/fs/directory.cpp @@ -204,7 +204,7 @@ struct utils::fs::detail::directory_iterator::impl : utils::noncopyable { original_errno); } if (result == NULL) { - _entry.reset(NULL); + _entry.reset(); close(); } else { _entry.reset(new directory_entry(_dirent.d_name)); diff --git a/contrib/kyua/utils/logging/operations.cpp b/contrib/kyua/utils/logging/operations.cpp index ce86183910b2..fbcf28b71169 100644 --- a/contrib/kyua/utils/logging/operations.cpp +++ b/contrib/kyua/utils/logging/operations.cpp @@ -245,7 +245,7 @@ logging::set_inmemory(void) if (globals->logfile.get() != NULL) { INV(globals->backlog.empty()); globals->logfile->flush(); - globals->logfile.reset(NULL); + globals->logfile.reset(); } } diff --git a/contrib/kyua/utils/process/child.cpp b/contrib/kyua/utils/process/child.cpp index d554f1fd9fb5..36b6b6b3e51f 100644 --- a/contrib/kyua/utils/process/child.cpp +++ b/contrib/kyua/utils/process/child.cpp @@ -206,12 +206,12 @@ process::child::fork_capture_aux(void) new signals::interrupts_inhibiter); pid_t pid = detail::syscall_fork(); if (pid == -1) { - inhibiter.reset(NULL); // Unblock signals. + inhibiter.reset(); // Unblock signals. ::close(fds[0]); ::close(fds[1]); throw process::system_error("fork(2) failed", errno); } else if (pid == 0) { - inhibiter.reset(NULL); // Unblock signals. + inhibiter.reset(); // Unblock signals. ::setsid(); try { @@ -263,10 +263,10 @@ process::child::fork_files_aux(const fs::path& stdout_file, new signals::interrupts_inhibiter); pid_t pid = detail::syscall_fork(); if (pid == -1) { - inhibiter.reset(NULL); // Unblock signals. + inhibiter.reset(); // Unblock signals. throw process::system_error("fork(2) failed", errno); } else if (pid == 0) { - inhibiter.reset(NULL); // Unblock signals. + inhibiter.reset(); // Unblock signals. ::setsid(); try { @@ -289,7 +289,7 @@ process::child::fork_files_aux(const fs::path& stdout_file, LD(F("Spawned process %s: stdout=%s, stderr=%s") % pid % stdout_file % stderr_file); signals::add_pid_to_kill(pid); - inhibiter.reset(NULL); // Unblock signals. + inhibiter.reset(); // Unblock signals. return std::unique_ptr< process::child >( new process::child(new impl(pid, NULL))); } diff --git a/contrib/kyua/utils/process/executor.cpp b/contrib/kyua/utils/process/executor.cpp index 843c9d862304..bddbeee7605f 100644 --- a/contrib/kyua/utils/process/executor.cpp +++ b/contrib/kyua/utils/process/executor.cpp @@ -633,10 +633,10 @@ struct utils::process::executor::executor_handle::impl : utils::noncopyable { "this could be an internal error or a buggy test") % root_work_directory->directory() % e.what()); } - root_work_directory.reset(NULL); + root_work_directory.reset(); interrupts_handler->unprogram(); - interrupts_handler.reset(NULL); + interrupts_handler.reset(); } /// Common code to run after any of the wait calls. diff --git a/contrib/kyua/utils/signals/interrupts.cpp b/contrib/kyua/utils/signals/interrupts.cpp index 829df7cfbf1e..bb0d1c319856 100644 --- a/contrib/kyua/utils/signals/interrupts.cpp +++ b/contrib/kyua/utils/signals/interrupts.cpp @@ -145,9 +145,9 @@ setup_handlers(void) static void cleanup_handlers(void) { - sighup_handler->unprogram(); sighup_handler.reset(NULL); - sigint_handler->unprogram(); sigint_handler.reset(NULL); - sigterm_handler->unprogram(); sigterm_handler.reset(NULL); + sighup_handler->unprogram(); sighup_handler.reset(); + sigint_handler->unprogram(); sigint_handler.reset(); + sigterm_handler->unprogram(); sigterm_handler.reset(); } diff --git a/contrib/kyua/utils/signals/timer.cpp b/contrib/kyua/utils/signals/timer.cpp index eceaa7fcd4ff..044dec87c352 100644 --- a/contrib/kyua/utils/signals/timer.cpp +++ b/contrib/kyua/utils/signals/timer.cpp @@ -257,7 +257,7 @@ public: _timer_activation = timer->when(); add_to_all_timers(timer); } catch (...) { - _sigalrm_programmer.reset(NULL); + _sigalrm_programmer.reset(); throw; } } @@ -276,7 +276,7 @@ public: } _sigalrm_programmer->unprogram(); - _sigalrm_programmer.reset(NULL); + _sigalrm_programmer.reset(); } /// Programs a new timer, possibly adjusting the global system timer. @@ -530,7 +530,7 @@ signals::timer::unprogram(void) } if (!globals->unprogram(this)) { - globals.reset(NULL); + globals.reset(); } _pimpl->programmed = false;