From nobody Tue Apr 08 10:20:10 2025 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 4ZX2By3Ldlz5s9VV; Tue, 08 Apr 2025 10:20:10 +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 4ZX2By2mN8z3bjF; Tue, 08 Apr 2025 10:20:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744107610; 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=rjHHmIQWnft9yS6SVZW4UlnTkt+IdpU9oh9MPgO5xeA=; b=Iupng/ZHFJo3eDlID1ROlS/PuNxRSPejGxy6ty3cf5Ck7IT9OUxUR02Veg3lRP6UN3FzJI dAg5WK5ap1Tnug8/K/Mc3EvqYYWsR0JOp1S9V/YCZaa7d96wyjZmccV7ROKqcS44VKCZy+ XhQAWgLfl3EvLO/QRBY1ia6Y0mh7xucxp6D7xroh6iaHR/bqKPTli46G+VmkAVAFVqGHHZ wamKyKGcf6ZJISBaJ+Bhqg//PZZ74hLgrHcenElu+lpxfC4Iuaf23y3JokdSBqU2CYG0F6 oJzEDP9Bxqv3h/NsT5hYh7WBitz0YVJ2Uy/VCSJ/59saGS92Z7su4BfTDTB9Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744107610; a=rsa-sha256; cv=none; b=aEN6/QE/kZDtNAlVjnI/UWCbqOr97pPj9On3L2uSWtBPDMbR4gQERR6tr5JChPXr9X/9J5 GXI0dVxdoqWki/SIh7dM2fKPjgAe6DMwrtR7IEjJYTMCa8AC9RLsWIHHUx2Vh842zdq9jl q6Jce3Cm1auGNGo5S/cxNEl8ycHXUgtSemFpnhwCPYKiIout3eJyGWPvx/y2EGOKhcxqd1 TLnbsF5VSf7rKn3uhiLUY2qOVjVi1CzYXcijRZscdEXc5qDQoM6Rr5w8Tb+jV2+iMZb5Pg OFVtyyDEJsIQ4mbhNaBw9VHo8usrWjPgoYQan9jO9BoABOJUY/kdP4uaGOTraA== 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=1744107610; 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=rjHHmIQWnft9yS6SVZW4UlnTkt+IdpU9oh9MPgO5xeA=; b=f5F6cPcZHNRhZimrp7/hYM+QfaZaSx/4z3DH2Wbj30mwmAm3H8kOQTZChAFylKbFUrN8BF OgreZby9hi2s3CDHxLMuodXgHzUMe+ojBi+oegF/i/qHlCcLddc6zAwAJrh1MWOIAZsOMJ aJIdKZS3ybcIZ955J6uAnxgKTLjJYnMx9yZIgjXzWOftxT+yPtwyowC+b35EmhbWxxCJ5O rT3b98uMiwPGwwMLUkteVwhAfI9cA8f8v6W4Z1SZCOe5POHafyAF3VUoaymTMDh4P+J6tI Vw0S0hNyZ44WZwulyKNS0oNN8dQf7J3N2Ifm2v5Q3yTw2zfduUQMoigj0eGhDQ== 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 4ZX2By20X9zBlC; Tue, 08 Apr 2025 10:20:10 +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 538AKAII050261; Tue, 8 Apr 2025 10:20:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538AKA07050254; Tue, 8 Apr 2025 10:20:10 GMT (envelope-from git) Date: Tue, 8 Apr 2025 10:20:10 GMT Message-Id: <202504081020.538AKA07050254@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: 9c84aea41433 - stable/14 - fts: Stop abusing the comma operator. 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 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/14 X-Git-Reftype: branch X-Git-Commit: 9c84aea41433505d610c6e2eb84c99fcd895a99f Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9c84aea41433505d610c6e2eb84c99fcd895a99f commit 9c84aea41433505d610c6e2eb84c99fcd895a99f Author: Dag-Erling Smørgrav AuthorDate: 2025-04-01 13:56:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-04-08 10:19:43 +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 64828ff73d60..5c4beef6f573 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;