Date: Mon, 03 Aug 2026 00:25:31 +0000 From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 0737ff2da5f4 - stable/15 - libthr/thread/thr_umtx.c: style _thr_ucond_wait() Message-ID: <6a6fdffb.1d400.6bc84fb6@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0737ff2da5f447f581db0ab5fb615820749a3c83 commit 0737ff2da5f447f581db0ab5fb615820749a3c83 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2026-07-25 21:37:55 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> 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))); } inthome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a6fdffb.1d400.6bc84fb6>