Merge pull request #251 from Gottox/improve/no-auto-dir-inode

file: remove auto search of directory inodes
Gottox · Jun 2, 2024 · 17c9258 · 17c9258
2 parents 2f8629d + f093cc5
commit 17c9258
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git 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
@@ -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
@@ -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};