From 8d4b2689ca3d300a0d56e0ad3edead8b14aa3eec Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Wed, 9 Jul 2025 09:35:40 +0200 Subject: [PATCH] recurse-dir: use -EBADF as placeholder for invalid fd As per our coding style. --- src/basic/recurse-dir.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/basic/recurse-dir.c b/src/basic/recurse-dir.c index 5080762078..05a2cfa2e0 100644 --- a/src/basic/recurse-dir.c +++ b/src/basic/recurse-dir.c @@ -175,7 +175,7 @@ int recurse_dir( r = func(RECURSE_DIR_ENTER, path, - -1, /* we have no parent fd */ + -EBADF, /* we have no parent fd */ dir_fd, NULL, /* we have no dirent */ statx_mask != 0 ? &root_sx : NULL, @@ -229,9 +229,9 @@ int recurse_dir( r = func(RECURSE_DIR_SKIP_OPEN_DIR_ERROR_BASE + errno, p, dir_fd, - -1, + /* inode_fd = */ -EBADF, de->entries[i], - NULL, + /* sx = */ NULL, userdata); if (r == RECURSE_DIR_LEAVE_DIRECTORY) break; @@ -273,9 +273,9 @@ int recurse_dir( r = func(RECURSE_DIR_SKIP_OPEN_INODE_ERROR_BASE + errno, p, dir_fd, - -1, + /* inode_fd = */ -EBADF, de->entries[i], - NULL, + /* sx = */ NULL, userdata); if (r == RECURSE_DIR_LEAVE_DIRECTORY) break; @@ -321,9 +321,9 @@ int recurse_dir( r = func(RECURSE_DIR_SKIP_STAT_INODE_ERROR_BASE + errno, p, dir_fd, - -1, + /* inode_fd = */ -EBADF, de->entries[i], - NULL, + /* sx = */ NULL, userdata); if (r == RECURSE_DIR_LEAVE_DIRECTORY) break; @@ -351,9 +351,9 @@ int recurse_dir( r = func(RECURSE_DIR_SKIP_STAT_INODE_ERROR_BASE + EISDIR, p, dir_fd, - -1, + /* inode_fd = */ -EBADF, de->entries[i], - NULL, + /* sx = */ NULL, userdata); if (r == RECURSE_DIR_LEAVE_DIRECTORY) break; @@ -476,9 +476,9 @@ int recurse_dir( r = func(RECURSE_DIR_LEAVE, path, - -1, + -EBADF, /* we have no parent fd */ dir_fd, - NULL, + NULL, /* we have no dirent */ statx_mask != 0 ? &root_sx : NULL, userdata); if (!IN_SET(r, RECURSE_DIR_LEAVE_DIRECTORY, RECURSE_DIR_SKIP_ENTRY, RECURSE_DIR_CONTINUE))