From nobody Sun Feb 1 21:40:47 2026 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 4f438J0gLqz6QjFr for ; Sun, 01 Feb 2026 21:40:48 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f438H5bwHz3FJb for ; Sun, 01 Feb 2026 21:40:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769982047; 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=BjD7BUvh4brSwiV4oBZyseuLhnOa/Ta2z9SdF/+Au0s=; b=Ur3EINScPhOXMQaHXZnirWI7WOMxozB5l+gF7FffoxQMUQ9naxqPlcwYYe8oH41cAqTOZD /vkapCMzgCNS9kHtbJsvGcDRSMSniztlnL6nltm10RmCqedNXg9XC3uUvLK8mGvjiRpIVV Xtd6o0SFjN3ZItDrdej9+sjK0mwQYm1igK9vvrR0fyaQT89BpmaBhbh/gQ4smQT/IpGJ1Q hyrifLQED56gJqpTytQSJAKurMIZmmos29x7sj9SBGv03aRf6TjXn/nmxP/KWc6se8HADJ G6sj/0k2ThdQKtsixeugXyHICEK5eO32pjDI+F7KCwG8/AdKSA2xHx/wBUfGXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769982047; a=rsa-sha256; cv=none; b=vbXdKo/QG1zuR9A2PO/aiJVqnaxXNTRI+MrZPiBu/XSq+wD6tUCx4h5RB/JR05Fr8Bwoy5 TlUx0uyiRmL2gtIWksc3IfvcgQsB0+wPCW3Jr+Xdl5YjvuVaQYkVcu9wnSs13YnbPpVtyA V7VsQSXN0NXhB72OE3yJBt6m6iNfM4Vz8OjUaDP5LmNsV5OLwuz8lgKjNAwCFrn3tpgQEx +Wzsct0b0Yz6EAnaMvZ0QMVnPv0qCb7D60BHgP7jIQICJLNJwleIehhc2qosFUVIan3AbI M2rISVc+GaCxyDHkksNehdhtJF4B0QcJeaMH0ZWpYzRRbqb6kjLuU4eDG6OEdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769982047; 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=BjD7BUvh4brSwiV4oBZyseuLhnOa/Ta2z9SdF/+Au0s=; b=GdcWfstm+os/VUide5BIt7Cerl4njCtfdMSBlPNxECKkwopPKPAWBI0mDiNJO7LrdER57q a06NfB3D5btcnB2HAQmkuqe83U3GuwKFcWvh/lZpRck+VPGARhHniJzGMZTnqJt4Vc5MLV ppzPzf1Q24ZXUC/eg42e2jxWwIJIdMvHtJSPrExYJj9E97SPV5HnQJSCuhO+rW5BHfK1KM KdPlTsnlq3YOfSVW5M7RnZ97SLn8lPof2fr0GBOsJj9nFg+aECtIEm7xbORl0gO5Zwhb0E u6zGpUUOWP1e3ekU+uUYCGT/eFPH3txrrtsfSmQx1nAwDpd1WwqR1YfwC+7MUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f438H4tgBzxcn for ; Sun, 01 Feb 2026 21:40:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b37c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Feb 2026 21:40:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: eadd5601bcc3 - stable/15 - kern/kern_exit.c: some style 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: eadd5601bcc377319b506a738bc64bc3d541bca4 Auto-Submitted: auto-generated Date: Sun, 01 Feb 2026 21:40:47 +0000 Message-Id: <697fc85f.3b37c.405a7528@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=eadd5601bcc377319b506a738bc64bc3d541bca4 commit eadd5601bcc377319b506a738bc64bc3d541bca4 Author: Konstantin Belousov AuthorDate: 2026-01-08 04:35:51 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-01 21:38:48 +0000 kern/kern_exit.c: some style (cherry picked from commit f5acbacb28f9fec7b9f159d36cc5056c9267a8ca) --- sys/kern/kern_exit.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index ab8ed32ad189..b67c4ab578b0 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -924,9 +924,9 @@ proc_reap(struct thread *td, struct proc *p, int *status, int options) q = td->td_proc; - if (status) + if (status != NULL) *status = KW_EXITCODE(p->p_xexit, p->p_xsig); - if (options & WNOWAIT) { + if ((options & WNOWAIT) != 0) { /* * Only poll, returning the status. Caller does not wish to * release the proc struct just yet. @@ -1114,7 +1114,7 @@ proc_to_reap(struct thread *td, struct proc *p, idtype_t idtype, id_t id, return (0); } - if (((options & WEXITED) == 0) && (p->p_state == PRS_ZOMBIE)) { + if ((options & WEXITED) == 0 && p->p_state == PRS_ZOMBIE) { PROC_UNLOCK(p); return (0); } @@ -1351,12 +1351,11 @@ loop_locked: (p->p_flag & P_WAITED) == 0); PROC_SUNLOCK(p); if (report) { - CTR4(KTR_PTRACE, - "wait: returning trapped pid %d status %#x " - "(xstat %d) xthread %d", - p->p_pid, W_STOPCODE(p->p_xsig), p->p_xsig, - p->p_xthread != NULL ? - p->p_xthread->td_tid : -1); + CTR4(KTR_PTRACE, + "wait: returning trapped pid %d status %#x (xstat %d) xthread %d", + p->p_pid, W_STOPCODE(p->p_xsig), p->p_xsig, + p->p_xthread != NULL ? + p->p_xthread->td_tid : -1); report_alive_proc(td, p, siginfo, status, options, CLD_TRAPPED); return (0); @@ -1412,20 +1411,20 @@ loop_locked: sx_xunlock(&proctree_lock); return (ECHILD); } - if (options & WNOHANG) { + if ((options & WNOHANG) != 0) { sx_xunlock(&proctree_lock); td->td_retval[0] = 0; return (0); } PROC_LOCK(q); - if (q->p_flag & P_STATCHILD) { + if ((q->p_flag & P_STATCHILD) != 0) { q->p_flag &= ~P_STATCHILD; PROC_UNLOCK(q); goto loop_locked; } sx_xunlock(&proctree_lock); error = msleep(q, &q->p_mtx, PWAIT | PCATCH | PDROP, "wait", 0); - if (error) + if (error != 0) return (error); goto loop; }