aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/fstree.h2
-rw-r--r--include/io/dir_entry.h6
-rw-r--r--include/io/dir_iterator.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/include/fstree.h b/include/fstree.h
index 3c3782e..0d60616 100644
--- a/include/fstree.h
+++ b/include/fstree.h
@@ -141,7 +141,7 @@ void fstree_cleanup(fstree_t *fs);
This function does not print anything to stderr, instead it sets an
appropriate errno value. Internally it uses fstree_mknode to create the node.
*/
-tree_node_t *fstree_add_generic(fstree_t *fs, const dir_entry_t *ent,
+tree_node_t *fstree_add_generic(fstree_t *fs, const sqfs_dir_entry_t *ent,
const char *extra);
/*
diff --git a/include/io/dir_entry.h b/include/io/dir_entry.h
index be5c400..8ff8cf0 100644
--- a/include/io/dir_entry.h
+++ b/include/io/dir_entry.h
@@ -16,7 +16,7 @@ typedef enum {
} DIR_ENTRY_FLAG;
/**
- * @struct dir_entry_t
+ * @struct sqfs_dir_entry_t
*
* @brief A directory entry returned by a @ref dir_iterator_t
*/
@@ -82,13 +82,13 @@ typedef struct {
* Windows with encoding-aware APIs, the name is converted to UTF-8.
*/
char name[];
-} dir_entry_t;
+} sqfs_dir_entry_t;
#ifdef __cplusplus
extern "C" {
#endif
-dir_entry_t *dir_entry_create(const char *name);
+sqfs_dir_entry_t *dir_entry_create(const char *name);
#ifdef __cplusplus
}
diff --git a/include/io/dir_iterator.h b/include/io/dir_iterator.h
index 1ea3321..18c0e9a 100644
--- a/include/io/dir_iterator.h
+++ b/include/io/dir_iterator.h
@@ -27,7 +27,7 @@ typedef struct dir_iterator_t {
* @return Zero on success, postivie value if the end of the list was
* reached, negative @ref SQFS_ERROR value on failure.
*/
- int (*next)(struct dir_iterator_t *it, dir_entry_t **out);
+ int (*next)(struct dir_iterator_t *it, sqfs_dir_entry_t **out);
/**
* @brief If the last entry was a symlink, extract the target path