From nobody Mon Apr 21 17:41:08 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 4ZhCMn5xt0z5sn0X; Mon, 21 Apr 2025 17:41:09 +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 4ZhCMm5Ppyz3SF4; Mon, 21 Apr 2025 17:41:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745257268; 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=aPYT6NSSIps9bXgPCDcEWKS1l/24o1fxgAU7gYtYXNY=; b=G0V6V/aMWpSQLaYvAEZUhEPJxJ74styBkM0FcvajxOFygqJa9qkM25FDtHJ2g0rbqCulOq PLNPesPgBzAw7RtaKOVTsiqH9FN105ZLulNjf7wnjFS0H3X+Ozj64Pob8puA9VcBsEW51Q W5NOY9MF0poCJzae51pexOsuUgomXk/96B121GNW3n89SvwXZnuhxnSVeR1771KxKzX4sP qWf7qjQ69f9CLcTT9ugsu+leqb9Scp5YEim6XhdlE8GjozV0zAYWt4dcJ1sRkCjirHIYgb qqG3vbZ9+UF7Mzi8CiZrf4iF90BpnbA+mQvFnsh88iZm40d/WBPIWFOSv2iKew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745257268; a=rsa-sha256; cv=none; b=tUu31xKEM9yo+tyPujvTYM5Po4pAFrmHgjFvqPi0DIjxImCb7w+dGMAjBkcTxDMeg+RQaj qLadCO1Ghod5dz8pyo2G0Fhuk7o72pg5E1Vk8d2c2K5CyxznS7sK1ztGU+m7U2zYsihhzz a6eYESXuUhwqz3h4CRzjAWI+ErQ5jQ98uJgZ1DcNQYHBRBylK0bsyIrhCiz0W+PjuR7+3q tPLX/1QmSN0IxvZWfAxsRzuILSQ+pi8ryYr0KVNgQjZHLpP9QZjdxOqdIs/V5l6u+PVzST 7n36IRwQPYXhwFKMdm5syp8SlubuCvssE2l4LDQjjdjgozBhNrfzr2FmDNEh4g== 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=1745257268; 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=aPYT6NSSIps9bXgPCDcEWKS1l/24o1fxgAU7gYtYXNY=; b=VvMx1iyQtxbX5jf3nizYSFzNXpc9zdv4glaHbdm0iAfnIDHTyFoiW24evPj1wKbd1ySslJ GN/jF8wrStX6GSXivFdLFJfzFUsmR0WiWFiejH15GPU8/WZRRYLyPFkzn3epEH+TeCW6KX SKHL8xazOAQu4Hi/Z4qtDv18VzsBbsOPnLszQzxkgnJtoR9ruPClXycaSNsWu1OvL9SMpK MkuhQRQwyDcO8ma2AXjbPAFkS5ilEExGHkwC+3wXqDUABd7UpfCx/xF0QGpuEfGCLWKqMf jGVw1Yk/wgGlvhgt+FFiqvzzEBCZWFlM3JLUpfXetVdtGIL3qPqClCSMAYzqXQ== 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 4ZhCMm4Jchz10bt; Mon, 21 Apr 2025 17:41:08 +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 53LHf8Di035939; Mon, 21 Apr 2025 17:41:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53LHf8YL035936; Mon, 21 Apr 2025 17:41:08 GMT (envelope-from git) Date: Mon, 21 Apr 2025 17:41:08 GMT Message-Id: <202504211741.53LHf8YL035936@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: da59bcdefd46 - stable/14 - fts: Move private flags away from public ones. 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: da59bcdefd46cb3a9416a2c9df50154beed9b248 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=da59bcdefd46cb3a9416a2c9df50154beed9b248 commit da59bcdefd46cb3a9416a2c9df50154beed9b248 Author: Dag-Erling Smørgrav AuthorDate: 2025-04-10 11:34:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-04-20 08:00:29 +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 (cherry picked from commit 80e06d621ac545ac0a69d4e95e7392be38013a78) --- include/fts.h | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/include/fts.h b/include/fts.h index 6c6a30e2d8c5..cf846d1b9238 100644 --- a/include/fts.h +++ b/include/fts.h @@ -48,18 +48,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;