From nobody Thu Apr 10 11:35:51 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 4ZYHnM5hrKz5sr0G; Thu, 10 Apr 2025 11:35:51 +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 4ZYHnM536Xz3hpq; Thu, 10 Apr 2025 11:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744284951; 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=SAIRGLMB8KbAmXLd23gTtLwvvRU7dDy9WlyLDWM+ESY=; b=u1p9xIROSHYGUel8I52oF6pj8Vv6TImRVo6ekwmLD+XrVgpZIRPthAP4TnkGjzxzj/Njxq ssxOzb+1Vq9Lkj6oWD6WHuLw4ufwcH8It9ogpRd1bMVIiWbWDDWcQiGgpchVjNtYHI3WHg GNTSbtKTOkpyGNh3gwjkGhkphTZZ0Ax0lmxmp8Gd1pZ+3VY7umYbMmau8FeOj1uh+gwNyc GuogDvJ8LTr6aN0PWECBna1VFQHuGpBKKpzHpa+IM8bRK8HbOr1TByI6NYJZEs2WHni/hR 4tbnO992VQIwCkZOoM7A0R+fNdG33VfDuu7iSKmAGWnkY05ixE8LRZkRJA9IQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744284951; a=rsa-sha256; cv=none; b=rGm5EBp414sk67ZZACIJ/xPvRJbvy7AkbwSzWqiG/IHRlCvxVZh74LiJWzNGCdCyq6g0Md /Y7Q1j+VcDh3mAuYJZSfM0hpPXI9GQ1oImR5izmSClJ/ZRGz6TCliONJgRW9dRrSPwDiN+ wluQFRsuPahqQYOZZNxDiHiMN/hcVfu1DEE0Y38uuOkB3qp7FigAych1JtaGkpA35VW1Bq Oh+MBGnNQ/Ch9cBm8wPdgXEcYEbpNgOl41Y4z4dIpm9Zs/WwOdrB25ytwTPIGYfFa/xYDu IVQQDDG5IG7uZvDcyCjPvt4VV/3rFiiZ6nkkjxLi8Q0hhU8Bcy53ZFFMJg+Eog== 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=1744284951; 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=SAIRGLMB8KbAmXLd23gTtLwvvRU7dDy9WlyLDWM+ESY=; b=vES8vhFsNBGiIeAlQas64Fhp7GIpI1pxxZC2qR0a5WUWs44lZHtr+HxFeaOXW9QUaE43VY z28ZOujQP8sl0+v7C/mvjN/nk3Bm2yfOgCtRAv9/86GCyHhba8IzeN5dXiseM1hHE3EesM YG0mkOHuk7ufLwq+DOQQCglVmlii4EaWh0kDKXE2q49+8IwA32vFvev66o2ZoDXs2h/w3c S5ypgqwqpCze0rMKn1se4fWeYhAM4OR/wClWrRweWDWeTVZVntWvC3ce1+gV5JKcTQOVce PwMxia/eNwEjr1Cv0dD9bbkC5yYssZXt01LXx5GOuqyKGvAQfkhxpCQH6ftgbQ== 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 4ZYHnM4bqgz11Mm; Thu, 10 Apr 2025 11:35:51 +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 53ABZpJc083243; Thu, 10 Apr 2025 11:35:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53ABZpg2083240; Thu, 10 Apr 2025 11:35:51 GMT (envelope-from git) Date: Thu, 10 Apr 2025 11:35:51 GMT Message-Id: <202504101135.53ABZpg2083240@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: 80e06d621ac5 - main - fts: Move private flags away from public ones. 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: 80e06d621ac545ac0a69d4e95e7392be38013a78 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=80e06d621ac545ac0a69d4e95e7392be38013a78 commit 80e06d621ac545ac0a69d4e95e7392be38013a78 Author: Dag-Erling Smørgrav AuthorDate: 2025-04-10 11:34:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-04-10 11:35:46 +0000 fts: Move private flags away from public ones. Renumber the private flags so there is a sizeable gap between them and the public flags, making it easier to add public flags in the future. These private flags are only ever set or read by FTS itself, so there is no compatibility issue. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D49711 --- include/fts.h | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/include/fts.h b/include/fts.h index dae1df80ddd7..1e35727ad3e1 100644 --- a/include/fts.h +++ b/include/fts.h @@ -46,18 +46,22 @@ typedef struct { int (*fts_compar) /* compare function */ (const struct _ftsent * const *, const struct _ftsent * const *); -#define FTS_COMFOLLOW 0x001 /* follow command line symlinks */ -#define FTS_LOGICAL 0x002 /* logical walk */ -#define FTS_NOCHDIR 0x004 /* don't change directories */ -#define FTS_NOSTAT 0x008 /* don't get stat info */ -#define FTS_PHYSICAL 0x010 /* physical walk */ -#define FTS_SEEDOT 0x020 /* return dot and dot-dot */ -#define FTS_XDEV 0x040 /* don't cross devices */ -#define FTS_WHITEOUT 0x080 /* return whiteout information */ -#define FTS_OPTIONMASK 0x0ff /* valid user option mask */ - -#define FTS_NAMEONLY 0x100 /* (private) child names only */ -#define FTS_STOP 0x200 /* (private) unrecoverable error */ +/* valid for fts_open() */ +#define FTS_COMFOLLOW 0x000001 /* follow command line symlinks */ +#define FTS_LOGICAL 0x000002 /* logical walk */ +#define FTS_NOCHDIR 0x000004 /* don't change directories */ +#define FTS_NOSTAT 0x000008 /* don't get stat info */ +#define FTS_PHYSICAL 0x000010 /* physical walk */ +#define FTS_SEEDOT 0x000020 /* return dot and dot-dot */ +#define FTS_XDEV 0x000040 /* don't cross devices */ +#define FTS_WHITEOUT 0x000080 /* return whiteout information */ +#define FTS_OPTIONMASK 0x0000ff /* valid user option mask */ + +/* valid only for fts_children() */ +#define FTS_NAMEONLY 0x000100 /* child names only */ + +/* internal use only */ +#define FTS_STOP 0x010000 /* unrecoverable error */ int fts_options; /* fts_open options, global flags */ void *fts_clientptr; /* thunk for sort function */ } FTS;