From nobody Mon Apr 21 17:41:13 2025 X-Original-To: dev-commits-src-branches@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 4ZhCMs4wCpz5snGY; Mon, 21 Apr 2025 17:41:13 +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 4ZhCMs3PrYz3SfT; Mon, 21 Apr 2025 17:41:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745257273; 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=3F+6zqJl9WrjlpnCIWA96KKiWfOBNT7mUkpfLjOwuzE=; b=aYg+G0R4UMd7tK1Ui6r+OUtNfowv2SX6MX+Rd6uRLI54m5Tb+ePg2hsmk1lVysaNopgsXu VthYJktURceSlZ6vLfM7aKI9TX2+628d31W/LYQhzo2z6Ldtx+JsV7rOnV4cV1KNNc1Cfx h67osbCg8bUpLGjmTk8W3SaZHG8TyVfTSrde0XLdjGNNUJftBX1P44yeDVGuFFdkqzEqhA EzUy7R3Vs0EWvHfiSlNa9aT0CNvJJqJhM5ZDPDm9P9G1iIR7oY/Cu8xMwsPmC6bN6DPUiY 5g0e8EtGm2EkU9RoJ2z1eWBKegoljxbdQp8EPglTiJ91kt/qdWRzG/qcrlRBNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745257273; a=rsa-sha256; cv=none; b=GalGEuv13y4bQ733Rpd0ik6S7MEGDIIS3pzuK+k3cYpogsJvy5af6tHN1Ulpp/OuKr9JoE sY2cY2/cSPKAtKJ3IlFIvqfDMS0vf4lQRXrlLmHNPGtKNqzXXWzjlJmpMazn+ijfAZPpLP fbyL89aLH8CIZcT0Zdv79VTokariX6EUdkALoIj6GIeT010DwbXFbhdLw+gLpjRNBvOG5d QFdBbgMlzXHbT6dvr8R6Ucl9tVP1dfh/5zIF7A6Fj50nuYrZerNJFIM6C9Kx4ocJXRDWTN xCMEQtPh3odKlWTZfkPXwX55hbRTamezPYNE1oXQFhVEIynIewf3xpEwG56njQ== 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=1745257273; 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=3F+6zqJl9WrjlpnCIWA96KKiWfOBNT7mUkpfLjOwuzE=; b=qVTKbKPBEVvPisOcRu6AZ+tq+4Mu9QoweWhT5wK0Wj8Uf+5HGZNkf39r74aDxpQHdiW+Jp 3y8eKN7cGLS6DjKaY3lmDieWxc4y2rBLIzVN8D0p40B658jCoRE6/qTjjauZBpFGz6zuTi 1ziu4JwtVRhBaIzXA162P/sYx8PpYCxONpdMem40F9UALuztDAGM+IgDT8Z7xvaRBnLPq3 4444FsxAj7h3zCLxK+TQlxgU6YNbYTQgJ31V1aKIiBKOuc8aHBI07Kv1FWE+ULlziVA7D3 rmmNjUs5k5FLYt87whJ1SSvi/TvvW0uoJf9BvB0wTYNqQ+5zpB1t186YQWtz3Q== 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 4ZhCMs2VYjz10ZF; Mon, 21 Apr 2025 17:41:13 +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 53LHfDxV036116; Mon, 21 Apr 2025 17:41:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53LHfDYI036113; Mon, 21 Apr 2025 17:41:13 GMT (envelope-from git) Date: Mon, 21 Apr 2025 17:41:13 GMT Message-Id: <202504211741.53LHfDYI036113@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: 413e5dca9dc5 - stable/13 - fts: Move private flags away from public ones. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 413e5dca9dc5e0c638f79e0904efbeaf38e6037c Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=413e5dca9dc5e0c638f79e0904efbeaf38e6037c commit 413e5dca9dc5e0c638f79e0904efbeaf38e6037c Author: Dag-Erling Smørgrav AuthorDate: 2025-04-10 11:34:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-04-20 08:00:24 +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;