From nobody Tue Apr 08 10:20:11 2025 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 4ZX2Bz43gqz5s9QK; Tue, 08 Apr 2025 10:20:11 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZX2Bz39s6z3byf; Tue, 08 Apr 2025 10:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744107611; 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=ztPnurOSiVZk50m/X/2zx2xKZ0X/gaxgltQkPLnX9Kw=; b=aSFjBDdIzYe/b2KsGTHaG8pfD3WEYHYUBYQJeW9D9ZmLwkleydGlCI2q6BRjURmupWJsCp KxEY98eYTBoQXlDBTHQ0CPNWKKjw2EszrbY+P4HbLyOBXCYmVBZEMa621e2VpEfYFuScVO JGPx3vHXzAtD566QKQlAzIo438WS9IudpEGuKmArMiFyhdqd5+lwEQ8xfyi/c2jwccJtHS 5gHSGQ8WlatVbpGauFc5ZbajgIsGDppEiY+v19i3Q5+374C5e4rwLPjgAasuUUFAC4C1Ny wbVOwRfDDugAN2tfav9/d7jWaGLMfsoWAa9uDYciiUniI+ead7vRCZZCr6faYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744107611; a=rsa-sha256; cv=none; b=V6DOn3oPsSoULDszQO5yu1DWMfWSd31jWWQMpKYvqr8RUd7WG5XPZOPUNHfLfTRLxQVpG7 fRkPF88AzrKbnULPYAanazMhYPj6/AjfSzDVVEOpFDKrDy1r7hkxNfZc/8eutUijC9a0BB a3EVFboJil6gocs44uo4wCqg6p9xjfb+SCEMBqlQgW/RvodJGETuTFF023hDZNijbn5OVE 5i1MQa3S8r+4L3O8nuKDPQ56OjnL8fFFwyQJnG8hfpuVD5vPwH9XXpaTDGzOWK52MxyS2f a0HuR/cd33fwepZd5vTGaHfLO6qnboilmcTteo58/0Gerlu8UoMr9gLlBAXjrg== 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=1744107611; 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=ztPnurOSiVZk50m/X/2zx2xKZ0X/gaxgltQkPLnX9Kw=; b=FvLwMcnjPkXYUNK7gPFK5+z/NzO8IYtVyZhBRAkK3KG9jrEefizcVdi5FYzaWJ+tlGHRaN Hzj2pnscXhNRtmsqMMMaX2NGYL5NqAo04w2N1Ot4clqT+jd1g028blQvE6buuy+542xA0C Nk8ye1CBhzqSGd+lZx93YTev2yPaefe37MEq4NjwigklcyuPoIUVmbculSH/JqwyJDhfuB kpTQK+MawQXPR0TemlA5WgzGB5sks9jawk1l3C7hp/b8rd7qZdhiV3IG8UeQHS9qshh4oH swNMQ8hEY8lwyFG/F+XehW4P9hDRcFVyYP+YW58YmeQGFI9HokW+c4CD1YA+zg== 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 4ZX2Bz2bf9zCJS; Tue, 08 Apr 2025 10:20:11 +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 538AKBBi051016; Tue, 8 Apr 2025 10:20:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538AKBfh051011; Tue, 8 Apr 2025 10:20:11 GMT (envelope-from git) Date: Tue, 8 Apr 2025 10:20:11 GMT Message-Id: <202504081020.538AKBfh051011@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 64f5a71c1cb7 - stable/13 - fts: Stop abusing the comma operator. 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 64f5a71c1cb79c09e50a37ddbe958224bb64add4 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=64f5a71c1cb79c09e50a37ddbe958224bb64add4 commit 64f5a71c1cb79c09e50a37ddbe958224bb64add4 Author: Dag-Erling Smørgrav AuthorDate: 2025-04-01 13:56:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-04-08 10:19:41 +0000 fts: Stop abusing the comma operator. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D49624 (cherry picked from commit 5abef29833d32d257a20b61732993987dd2a6056) --- lib/libc/gen/fts.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c index ff51d2b224c2..9ffd0bd9972d 100644 --- a/lib/libc/gen/fts.c +++ b/lib/libc/gen/fts.c @@ -901,10 +901,12 @@ fts_stat(FTS *sp, FTSENT *p, int follow, int dfd) int saved_errno; const char *path; - if (dfd == -1) - path = p->fts_accpath, dfd = AT_FDCWD; - else + if (dfd == -1) { + path = p->fts_accpath; + dfd = AT_FDCWD; + } else { path = p->fts_name; + } /* If user needs stat info, stat buffer already allocated. */ sbp = ISSET(FTS_NOSTAT) ? &sb : p->fts_statp;