From nobody Tue Apr 01 13:59:46 2025 X-Original-To: dev-commits-src-main@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 4ZRqPZ2l3Jz5rZDN; Tue, 01 Apr 2025 13:59:46 +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 4ZRqPZ290Rz3gyd; Tue, 01 Apr 2025 13:59:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743515986; 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=NIzELiZIHLCD3O1xf42gLafhTHLScgSxjbuHX77IvG8=; b=H1RWBTLvnqieJQaZocReipHY7KoWUdlDDsLd4ECuU9sGgVljQk6PFnlpk2uwBF9YW7kQmk i5UxZSZeW/eLbg68POLRm5FUPeugCkNh/ruoZeIJUY0FSePuzP016cTyC2+JuwbHxNTCgV FB4MrGk8MjnBF5/EfJq7OHt25C6pZt7yj+gAGkErj434jYA/9e0K3u5Ms5SRXKC7zFQGbC T354kHnmKAF6p1WQrrtaFCjimcRvaQatPT721GA3GOBbffYkk7H38UrECbPosKHYkjxxpi qMrJK3T1NREWpOk+kd5p0u9FPJzxt+QBvKE4RoUD7REKRUcBxppHE18p82AfSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743515986; a=rsa-sha256; cv=none; b=EkwJ7dDets7FRsOKn9qkPfg9eJ83466Y+fnLVwVi8rCXTk0BlqgpTESxpxPuiyeRH14MaR qwt2KpTAAJ//ggiRuGPsVchJJFJMWYN/Qk3IWTuHZ5CZPoGk8ekuzPXK6pTPKKH5CLykzD wxbyw7cr6s/mXXkYhnXMcTt/sbdOV0hMLXT4gkf3H9u1hHy4rTtC06GqhdONWvzkvKWrsa MCvje1Gp+LfYTdu+PWYGLjY0q9QLo1J8Aoy2Gt//YOgVJV02iM/2Bm3CTFVqdRI0tGeTWJ kLmxtEKcEBFAMxvYt61L/BcHMnzDLcNbzqACAmePbnPxqjKLbq14bEnomTfI7Q== 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=1743515986; 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=NIzELiZIHLCD3O1xf42gLafhTHLScgSxjbuHX77IvG8=; b=DAu1hay49FdrcMzmv/O6tYC/1Y5cfMg9nWPk/whvzM0xTby3nnefaEkLIGKGqZK8dLpghO KZFbCNsPYO0TQpzzaiV6t+uOrSeXvCeLJ66BlPKJvsUCaAJzyxLzhEU+DgJ3DEinhy1ADP DhV0V1pEKitB/Cp5eKCAqR2+Alvwe9CMkVPpv94xEfzFGToIVG+M2x60edB2+UKBkjdDV/ ta1O6LLFTeWSNEPx6IcreDwG01YxuqxWB004XHWlGLGLkrEDBdNW+2qZNrTvsEX+CMtg5W kpIJnb/u9d4pzcmk84cvw5o7oLvuDFG0ocBuoBsC3wTk24AH4b//UTIsZ4cXyQ== 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 4ZRqPZ1Sg5zZtH; Tue, 01 Apr 2025 13:59:46 +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 531Dxk24023698; Tue, 1 Apr 2025 13:59:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 531DxkKu023695; Tue, 1 Apr 2025 13:59:46 GMT (envelope-from git) Date: Tue, 1 Apr 2025 13:59:46 GMT Message-Id: <202504011359.531DxkKu023695@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 5abef29833d3 - main - fts: Stop abusing the comma operator. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5abef29833d32d257a20b61732993987dd2a6056 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5abef29833d32d257a20b61732993987dd2a6056 commit 5abef29833d32d257a20b61732993987dd2a6056 Author: Dag-Erling Smørgrav AuthorDate: 2025-04-01 13:56:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-04-01 13:59:42 +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 --- 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 80f98a993123..0c26c91feb84 100644 --- a/lib/libc/gen/fts.c +++ b/lib/libc/gen/fts.c @@ -900,10 +900,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;