From f093cc5df3be579690b9695339c94498250a0670 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 2 Jun 2024 09:04:35 +0200 Subject: [PATCH] file: remove auto search of directory inodes --- libsqsh/include/sqsh_file_private.h | 2 -- libsqsh/src/file/file.c | 8 -------- test/libsqsh/tree/traversal.c | 2 +- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/libsqsh/include/sqsh_file_private.h b/libsqsh/include/sqsh_file_private.h index a0c8fab9..d07a7c1d 100644 --- a/libsqsh/include/sqsh_file_private.h +++ b/libsqsh/include/sqsh_file_private.h @@ -207,8 +207,6 @@ SQSH_NO_EXPORT int sqsh__file_reader_cleanup(struct SqshFileReader *reader); * file/file.c */ -#define SQSH_AUTO_DIR_INODE UINT32_MAX - /** * @brief The file type implementation */ diff --git a/libsqsh/src/file/file.c b/libsqsh/src/file/file.c index a658b909..d0c46e62 100644 --- a/libsqsh/src/file/file.c +++ b/libsqsh/src/file/file.c @@ -214,14 +214,6 @@ sqsh__file_init( goto out; } - if (dir_inode == SQSH_AUTO_DIR_INODE) { - if (sqsh_file_type(inode) == SQSH_FILE_TYPE_DIRECTORY) { - dir_inode = sqsh_file_directory_parent_inode(inode); - } else { - rv = -SQSH_ERROR_NOT_A_DIRECTORY; - goto out; - } - } inode->dir_inode = dir_inode; rv = sqsh_archive_inode_map(archive, &inode_map); diff --git a/test/libsqsh/tree/traversal.c b/test/libsqsh/tree/traversal.c index 63a2e1dd..3e4f8950 100644 --- a/test/libsqsh/tree/traversal.c +++ b/test/libsqsh/tree/traversal.c @@ -72,7 +72,7 @@ UTEST(traversal, test_recursive_directory) { mk_stub(&archive, payload, sizeof(payload)); struct SqshFile file = {0}; - rv = sqsh__file_init(&file, &archive, 0, SQSH_AUTO_DIR_INODE); + rv = sqsh__file_init(&file, &archive, 0, 2); ASSERT_EQ(0, rv); struct SqshTreeTraversal traversal = {0};