From nobody Thu May 8 14:29:41 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 4ZtZK14cGDz5v8SZ; Thu, 08 May 2025 14:29:41 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZtZK11qbcz3HfK; Thu, 08 May 2025 14:29:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746714581; 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=AjW2yHUlx/SBR7LEEko3sDa8CkwLBfCvYWMeRjxpDKY=; b=oZzNE+Rq/XqRiQ45VqgGYmrMZ/rQBQFLU6tH1FIDndNLrT6ME0UTfiL/eFW3Tt2bA0Lq+M Jrf0OLZvI4UHQFpaewuggakzWShIFPX/P1hOCQmEc1duX4ksXLo63zaTgaP42vbtbhy41r 7dYaLh0TasFgetpvEeAixTBXduglPaOaeQdNUwmg1IFJzGrZNXCaI6AOaz/0oOMwUtQrHG enMnRV2P9IXLbNu0Lk0YxttM1ALMfHu8b+P+i7ooZ729mcfo9lfcYMQ+WiCkRYLJl53/2t PCzUEFahpIAt3ah1kASM9hVuIpVZ6inqIqXb4yMFU1TdUbH4GVwMhMXqfn6iPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746714581; 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=AjW2yHUlx/SBR7LEEko3sDa8CkwLBfCvYWMeRjxpDKY=; b=gb75vuI23K/vXRyf5genoJiFJlJ0D2gJQMusXrXj2r60waq8eaaoibgI8HHsheb05dK3RM ZzFqmxKHixT2LotJF+W08SA5uGp942l8IEV1GIGxSIGvWTC1KIHY+iAKS9HZc1pY0WD5R2 StGvozyXcm6osSk+X8EFJi5q/S4hSDO43Gk4vl3iLBcBcWEZFZRtMyl4hnupPbyiZ5Mw+u UZ6MvnJdU/xCcpjj9LaXoB+tEJTD7vIHVX3pdg/9W8z/9RFlJBz+RHVektsAulChAgwLtZ ABxsmkSxK+33Muj3dfAjFFGzI7kPhfVMxUqdLmMMDVglyvYxaOj6JJ82Dp8xBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746714581; a=rsa-sha256; cv=none; b=EnQGm/QJ/JDOIGrRBm3B3r6YNp7s2sm/tL4V7YuBAjWAiItHUJCTf83PR2FmsuVr9gGB59 aVA5mUpYnr3E6jPz63x92j2X0ip1XSxPiw9C4onBgjUqJE9z8zRSgw5QP3P8SNLS0emsK1 LNttuX+MRnn4/6J9NrEDcuso22yjos3+j8ulU7BfORZ/KQZxn3Of76t3Z2OVTEFrF5K32Y aJIsgVOwglXAd7dv49e6aLVIsQcX8XId3q9Oh53D0TboQKwEVotoZXBgg1Qciu2BM5kG7r 7+9OkuVn6H+RxPp271JLGY9ssIoWU+fSjOoArUD1fV2sgNRd8W+V1U1B61rpLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZtZK11Dxkz350; Thu, 08 May 2025 14:29:41 +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 548ETfMi086557; Thu, 8 May 2025 14:29:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 548ETf8S086554; Thu, 8 May 2025 14:29:41 GMT (envelope-from git) Date: Thu, 8 May 2025 14:29:41 GMT Message-Id: <202505081429.548ETf8S086554@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: bdc2ed1cf47c - main - fts: Drop obsolete conditionals. 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: bdc2ed1cf47ccf9a03b69f467e4406a4d437234b Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=bdc2ed1cf47ccf9a03b69f467e4406a4d437234b commit bdc2ed1cf47ccf9a03b69f467e4406a4d437234b Author: Dag-Erling Smørgrav AuthorDate: 2025-05-08 14:28:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-05-08 14:29:15 +0000 fts: Drop obsolete conditionals. We've never not had DT_DIR or FTS_WHITEOUT. Sponsored by: Klara, Inc. Reviewed by: kevans, imp Differential Revision: https://reviews.freebsd.org/D50218 --- lib/libc/gen/fts.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c index d440bc24eeca..a55b4a6e2981 100644 --- a/lib/libc/gen/fts.c +++ b/lib/libc/gen/fts.c @@ -743,14 +743,10 @@ fts_build(FTS *sp, int type) * Open the directory for reading. If this fails, we're done. * If being called from fts_read, set the fts_info field. */ -#ifdef FTS_WHITEOUT if (ISSET(FTS_WHITEOUT)) oflag = DTF_NODUP; else oflag = DTF_HIDEW | DTF_NODUP; -#else -#define __opendir2(path, flag) opendir(path) -#endif if ((dirp = __opendir2(cur->fts_accpath, oflag)) == NULL) { if (type == BREAD) { cur->fts_info = FTS_DNR; @@ -877,10 +873,8 @@ mem1: saved_errno = errno; p->fts_parent = sp->fts_cur; p->fts_pathlen = len + dnamlen; -#ifdef FTS_WHITEOUT if (dp->d_type == DT_WHT) p->fts_flags |= FTS_ISW; -#endif if (cderrno) { if (nlinks) { @@ -889,12 +883,8 @@ mem1: saved_errno = errno; } else p->fts_info = FTS_NSOK; p->fts_accpath = cur->fts_accpath; - } else if (nlinks == 0 -#ifdef DT_DIR - || (nostat && - dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN) -#endif - ) { + } else if (nlinks == 0 || (nostat && + dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN)) { p->fts_accpath = ISSET(FTS_NOCHDIR) ? p->fts_path : p->fts_name; p->fts_info = FTS_NSOK; @@ -1003,7 +993,6 @@ fts_stat(FTS *sp, FTSENT *p, int follow, int dfd) /* If user needs stat info, stat buffer already allocated. */ sbp = ISSET(FTS_NOSTAT) ? &sb : p->fts_statp; -#ifdef FTS_WHITEOUT /* Check for whiteout. */ if (p->fts_flags & FTS_ISW) { if (sbp != &sb) { @@ -1012,7 +1001,6 @@ fts_stat(FTS *sp, FTSENT *p, int follow, int dfd) } return (FTS_W); } -#endif /* * If doing a logical walk, or application requested FTS_FOLLOW, do