aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--extras/browse.c2
-rw-r--r--include/sqfs/dir.h6
-rw-r--r--include/sqfs/dir_reader.h2
-rw-r--r--include/sqfs/meta_reader.h4
-rw-r--r--include/sqfs/predef.h2
-rw-r--r--lib/sqfs/src/dir_reader/dir_reader.c10
-rw-r--r--lib/sqfs/src/dir_reader/read_tree.c4
-rw-r--r--lib/sqfs/src/dir_writer.c4
-rw-r--r--lib/sqfs/src/readdir.c6
9 files changed, 20 insertions, 20 deletions
diff --git a/extras/browse.c b/extras/browse.c
index 8bc6fc3..c0c9995 100644
--- a/extras/browse.c
+++ b/extras/browse.c
@@ -65,7 +65,7 @@ static void list_directory(const char *dirname)
{
sqfs_inode_generic_t *root, *inode;
size_t i, max_len, len, col_count;
- sqfs_dir_entry_t *ent;
+ sqfs_dir_node_t *ent;
int ret;
/* Get the directory inode we want to dump and open the directory */
diff --git a/include/sqfs/dir.h b/include/sqfs/dir.h
index 8a76f3d..6f7dadf 100644
--- a/include/sqfs/dir.h
+++ b/include/sqfs/dir.h
@@ -41,7 +41,7 @@
*/
struct sqfs_dir_header_t {
/**
- * @brief The number of @ref sqfs_dir_entry_t entries that are
+ * @brief The number of @ref sqfs_dir_node_t entries that are
* following.
*
* This value is stored off by one and the total count must not
@@ -63,7 +63,7 @@ struct sqfs_dir_header_t {
};
/**
- * @struct sqfs_dir_entry_t
+ * @struct sqfs_dir_node_t
*
* @brief On-disk data structure of a directory entry. Many of these
* follow a single @ref sqfs_dir_header_t.
@@ -71,7 +71,7 @@ struct sqfs_dir_header_t {
* See @ref sqfs_dir_writer_t for an overview on how SquashFS stores
* directories on disk.
*/
-struct sqfs_dir_entry_t {
+struct sqfs_dir_node_t {
/**
* @brief An offset into the uncompressed meta data block containing
* the coresponding inode.
diff --git a/include/sqfs/dir_reader.h b/include/sqfs/dir_reader.h
index ace7bad..1489a1f 100644
--- a/include/sqfs/dir_reader.h
+++ b/include/sqfs/dir_reader.h
@@ -296,7 +296,7 @@ SQFS_API int sqfs_dir_reader_find(sqfs_dir_reader_t *rd, const char *name);
* number if the end of the current directory listing has been reached.
*/
SQFS_API int sqfs_dir_reader_read(sqfs_dir_reader_t *rd,
- sqfs_dir_entry_t **out);
+ sqfs_dir_node_t **out);
/**
* @brief Read the inode that the current directory entry points to.
diff --git a/include/sqfs/meta_reader.h b/include/sqfs/meta_reader.h
index 149672b..9563b82 100644
--- a/include/sqfs/meta_reader.h
+++ b/include/sqfs/meta_reader.h
@@ -182,7 +182,7 @@ SQFS_API int sqfs_meta_reader_read_dir_header(sqfs_meta_reader_t *m,
* @return Zero on success, an @ref SQFS_ERROR value on failure.
*/
SQFS_API int sqfs_meta_reader_read_dir_ent(sqfs_meta_reader_t *m,
- sqfs_dir_entry_t **ent);
+ sqfs_dir_node_t **ent);
/**
* @brief Initialize a state object for reading a directory
@@ -232,7 +232,7 @@ int sqfs_readdir_state_init(sqfs_readdir_state_t *s, const sqfs_super_t *super,
*/
SQFS_API int sqfs_meta_reader_readdir(sqfs_meta_reader_t *m,
sqfs_readdir_state_t *s,
- sqfs_dir_entry_t **ent,
+ sqfs_dir_node_t **ent,
sqfs_u32 *inum, sqfs_u64 *iref);
/**
diff --git a/include/sqfs/predef.h b/include/sqfs/predef.h
index aae95e4..989649a 100644
--- a/include/sqfs/predef.h
+++ b/include/sqfs/predef.h
@@ -101,7 +101,7 @@ typedef struct sqfs_ostream_t sqfs_ostream_t;
typedef struct sqfs_fragment_t sqfs_fragment_t;
typedef struct sqfs_dir_header_t sqfs_dir_header_t;
-typedef struct sqfs_dir_entry_t sqfs_dir_entry_t;
+typedef struct sqfs_dir_node_t sqfs_dir_node_t;
typedef struct sqfs_dir_index_t sqfs_dir_index_t;
typedef struct sqfs_inode_t sqfs_inode_t;
typedef struct sqfs_inode_dev_t sqfs_inode_dev_t;
diff --git a/lib/sqfs/src/dir_reader/dir_reader.c b/lib/sqfs/src/dir_reader/dir_reader.c
index d70f729..aea6841 100644
--- a/lib/sqfs/src/dir_reader/dir_reader.c
+++ b/lib/sqfs/src/dir_reader/dir_reader.c
@@ -206,12 +206,12 @@ int sqfs_dir_reader_open_dir(sqfs_dir_reader_t *rd,
return 0;
}
-static int mk_dummy_entry(const char *str, sqfs_dir_entry_t **out)
+static int mk_dummy_entry(const char *str, sqfs_dir_node_t **out)
{
size_t len = strlen(str);
- sqfs_dir_entry_t *ent;
+ sqfs_dir_node_t *ent;
- ent = calloc(1, sizeof(sqfs_dir_entry_t) + len + 1);
+ ent = calloc(1, sizeof(sqfs_dir_node_t) + len + 1);
if (ent == NULL)
return SQFS_ERROR_ALLOC;
@@ -224,7 +224,7 @@ static int mk_dummy_entry(const char *str, sqfs_dir_entry_t **out)
return 0;
}
-int sqfs_dir_reader_read(sqfs_dir_reader_t *rd, sqfs_dir_entry_t **out)
+int sqfs_dir_reader_read(sqfs_dir_reader_t *rd, sqfs_dir_node_t **out)
{
int err;
@@ -265,7 +265,7 @@ int sqfs_dir_reader_rewind(sqfs_dir_reader_t *rd)
int sqfs_dir_reader_find(sqfs_dir_reader_t *rd, const char *name)
{
- sqfs_dir_entry_t *ent;
+ sqfs_dir_node_t *ent;
int ret;
ret = sqfs_dir_reader_rewind(rd);
diff --git a/lib/sqfs/src/dir_reader/read_tree.c b/lib/sqfs/src/dir_reader/read_tree.c
index 91cc2c0..7d6bf67 100644
--- a/lib/sqfs/src/dir_reader/read_tree.c
+++ b/lib/sqfs/src/dir_reader/read_tree.c
@@ -64,7 +64,7 @@ static int fill_dir(sqfs_dir_reader_t *dr, sqfs_tree_node_t *root,
{
sqfs_tree_node_t *n, *prev, **tail;
sqfs_inode_generic_t *inode;
- sqfs_dir_entry_t *ent;
+ sqfs_dir_node_t *ent;
int err;
tail = &root->children;
@@ -188,7 +188,7 @@ int sqfs_dir_reader_get_full_hierarchy(sqfs_dir_reader_t *rd,
{
sqfs_tree_node_t *root, *tail, *new;
sqfs_inode_generic_t *inode;
- sqfs_dir_entry_t *ent;
+ sqfs_dir_node_t *ent;
const char *ptr;
int ret;
diff --git a/lib/sqfs/src/dir_writer.c b/lib/sqfs/src/dir_writer.c
index d2b72df..3f7fed1 100644
--- a/lib/sqfs/src/dir_writer.c
+++ b/lib/sqfs/src/dir_writer.c
@@ -235,7 +235,7 @@ static size_t get_conseq_entry_count(sqfs_u32 offset, dir_entry_t *head)
if (diff > 32767 || diff < -32767)
break;
- size += sizeof(sqfs_dir_entry_t) + it->name_len;
+ size += sizeof(sqfs_dir_node_t) + it->name_len;
if (count > 0 && size > SQFS_META_BLOCK_SIZE)
break;
@@ -286,7 +286,7 @@ static int add_header(sqfs_dir_writer_t *writer, size_t count,
int sqfs_dir_writer_end(sqfs_dir_writer_t *writer)
{
dir_entry_t *it, *first;
- sqfs_dir_entry_t ent;
+ sqfs_dir_node_t ent;
sqfs_u16 *diff_u16;
size_t i, count;
sqfs_u32 offset;
diff --git a/lib/sqfs/src/readdir.c b/lib/sqfs/src/readdir.c
index e2dbcd4..9feaf22 100644
--- a/lib/sqfs/src/readdir.c
+++ b/lib/sqfs/src/readdir.c
@@ -35,9 +35,9 @@ int sqfs_meta_reader_read_dir_header(sqfs_meta_reader_t *m,
}
int sqfs_meta_reader_read_dir_ent(sqfs_meta_reader_t *m,
- sqfs_dir_entry_t **result)
+ sqfs_dir_node_t **result)
{
- sqfs_dir_entry_t ent, *out;
+ sqfs_dir_node_t ent, *out;
sqfs_u16 *diff_u16;
int err;
@@ -90,7 +90,7 @@ int sqfs_readdir_state_init(sqfs_readdir_state_t *s, const sqfs_super_t *super,
}
int sqfs_meta_reader_readdir(sqfs_meta_reader_t *m, sqfs_readdir_state_t *it,
- sqfs_dir_entry_t **ent,
+ sqfs_dir_node_t **ent,
sqfs_u32 *inum, sqfs_u64 *iref)
{
size_t count;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 16:43:58 +0000