3 00:25:31 2026 X-Original-To: dev-commits-src-all@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 4hCyBN1Xh8z6mj3t for ; Mon, 03 Aug 2026 00:25:32 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hCyBN099Rz4P3l for ; Mon, 03 Aug 2026 00:25:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785716732; 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=jOEm2RWIjMtwifLW7lSFPt2Rh9UfgJJyVwhKOeZ330w=; b=Aky2smL4H8o1CqnI56jO/d/XW0wWGOQ7CZbQPvH6qLAolP3GBDfH9UlXLOh535vVTDS6aO 9XJFg4FX5QekUcF4IoB30gKFWOtv6rIlR/qBXFg4dlARd6/cXiSaXCY4P7ugy1BBBv5bG5 jKQCyfOx9GmIA79zLXETixFhcIo4s6yewLmH5h+CjlAvuCb9oY5Cs2s1nbmvEY6858CEDT sNuSIWnFgbnTa5mvHS94RaPeme3WODhjJz48pGr84To/3uWXkj8nr+3YMxGnRhUd7hOcvI 7KootJURJN50cqiMYs3/wHrAkvLaLvrrZijBYB3rnWuE1TOfpeTjtCxWrnNoGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785716732; a=rsa-sha256; cv=none; b=GruCqmkhwfjgY26YscLui1FxA8SE8FbvzEW2gVtVX0+ir4PRuCIUmrIPixp0Sp9mpgtTI4 Z3ar2Ds8chPMYxOO1HCjLefzKReVBGzkOwfsU5M4hHgOKB/yVNTljUMkF/5ywdeoEYq3nG SYr/amyXAhaEPdiB+5OBTSuc2vdbj7MOMSDQWfCj37EaSAt4+srCyAF30Hcq07Ke5svMxI hkEJ8u0RvoJe+5sY6yUVSxhKp+JAarIoT8fdOkDN+WjTU0q4FukOumxNkhtODdbpm2V49M Gga8HfFGbkQEvR5+nIlelUcfIoFz2e3kHa2tVVfTqb3Vc8B+NAyCDIkh2FPTsw== 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=1785716732; 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=jOEm2RWIjMtwifLW7lSFPt2Rh9UfgJJyVwhKOeZ330w=; b=gH/l8a5hZyMS37NLt1Zrh52cqebTlCS1aOdEzy6m83Ciz9Gf2CWlR7sWh2R6T+G6z3SdEH qi+DybX++RKRj4/2Xn4XNOlpnr7tC0DYtDbXFvkNIB4BUsBIlswGez1sdLm1lqs+TGdz9U WokHDfcNwtn7SF0boqmHsvSfdAbNP5bGhwKRq7wh9RoZi4FF/nNzeoejU2lkoMWRRQk7Gd ix05gA5zzZPoEBOL2LOhX/kkwQVFKFStJ8b25GvSaTW2l8HgTVeWQLATQKqu3Re+wdatJr r6Mio6PS1OmVn2U+mExKqTWXiyUWzEPiBJFsJ8yqL9+aPXRw9tnW5XrrXGJy3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hCyBM6H5lzdlg for ; Mon, 03 Aug 2026 00:25:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d400 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 03 Aug 2026 00:25:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 0737ff2da5f4 - stable/15 - libthr/thread/thr_umtx.c: style _thr_ucond_wait() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 0737ff2da5f447f581db0ab5fb615820749a3c83 Auto-Submitted: auto-generated Date: Mon, 03 Aug 2026 00:25:31 +0000 Message-Id: <6a6fdffb.1d400.6bc84fb6@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0737ff2da5f447f581db0ab5fb615820749a3c83 commit 0737ff2da5f447f581db0ab5fb615820749a3c83 Author: Konstantin Belousov AuthorDate: 2026-07-25 21:37:55 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-03 00:23:15 +0000 libthr/thread/thr_umtx.c: style _thr_ucond_wait() (cherry picked from commit 196cc005b197ab8bf5044c3fc457697986a14b39) --- lib/libthr/thread/thr_umtx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libthr/thread/thr_umtx.c b/lib/libthr/thread/thr_umtx.c index bbc68d0e30c6..db63017a6a13 100644 --- a/lib/libthr/thread/thr_umtx.c +++ b/lib/libthr/thread/thr_umtx.c @@ -242,18 +242,18 @@ _thr_ucond_init(struct ucond *cv) int _thr_ucond_wait(struct ucond *cv, struct umutex *m, - const struct timespec *timeout, int flags) + const struct timespec *timeout, int flags) { struct pthread *curthread; - if (timeout && (timeout->tv_sec < 0 || (timeout->tv_sec == 0 && + if (timeout != NULL && (timeout->tv_sec < 0 || (timeout->tv_sec == 0 && timeout->tv_nsec <= 0))) { curthread = _get_curthread(); _thr_umutex_unlock(m, TID(curthread)); return (ETIMEDOUT); } return (_umtx_op_err(cv, UMTX_OP_CV_WAIT, flags, m, - __DECONST(void*, timeout))); + __DECONST(void *, timeout))); } int