Date: Thu, 29 Jan 2026 15:39:52 +0000 From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: d0e6d7538189 - stable/14 - kyua: Don't pass NULL to std::unique_ptr<>::reset() Message-ID: <697b7f48.38e54.66877de4@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d0e6d7538189108a33c0ea84a502cff832f49fab commit d0e6d7538189108a33c0ea84a502cff832f49fab Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2025-05-03 15:59:02 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2026-01-29 15:17:37 +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 (cherry picked from commit d61c8bca8648fa6dfa89bd5c7dc75726a2740c15) --- 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 1d85cea9a2f7..b73741aa544d 100644 --- a/contrib/kyua/utils/fs/directory.cpp +++ b/contrib/kyua/utils/fs/directory.cpp @@ -198,7 +198,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(result->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 33fa04f7ffe1..7aa3d14d313a 100644 --- a/contrib/kyua/utils/process/executor.cpp +++ b/contrib/kyua/utils/process/executor.cpp @@ -615,10 +615,10 @@ struct utils::process::executor::executor_handle::impl : utils::noncopyable { "an internal error") % 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;home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?697b7f48.38e54.66877de4>