From ec593e0b94656a5481f82ee0f33728ced297ac48 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 2 Jul 2023 19:31:51 +0200 Subject: Refactor: rename dir_entry_t to sqfs_dir_entry_t Exact operation performed: git ls-files -z | \ xargs -0 sed -i -e 's/dir_entry_t/sqfs_dir_entry_t/g Signed-off-by: David Oberhollenzer --- include/fstree.h | 2 +- include/io/dir_entry.h | 6 +++--- include/io/dir_iterator.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'include') 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 -- cgit v1.2.3