aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/gensquashfs/src/fstree_from_dir.c2
-rw-r--r--bin/gensquashfs/src/glob.c2
-rw-r--r--bin/gensquashfs/src/mkfs.c2
-rw-r--r--bin/gensquashfs/src/mkfs.h2
-rw-r--r--bin/tar2sqfs/src/process_tarball.c14
-rw-r--r--bin/tar2sqfs/src/tar2sqfs.c2
-rw-r--r--bin/tar2sqfs/src/tar2sqfs.h2
7 files changed, 14 insertions, 12 deletions
diff --git a/bin/gensquashfs/src/fstree_from_dir.c b/bin/gensquashfs/src/fstree_from_dir.c
index fe0a022..cbdc270 100644
--- a/bin/gensquashfs/src/fstree_from_dir.c
+++ b/bin/gensquashfs/src/fstree_from_dir.c
@@ -6,7 +6,7 @@
*/
#include "mkfs.h"
-int fstree_from_dir(fstree_t *fs, dir_iterator_t *dir)
+int fstree_from_dir(fstree_t *fs, sqfs_dir_iterator_t *dir)
{
for (;;) {
sqfs_dir_entry_t *ent = NULL;
diff --git a/bin/gensquashfs/src/glob.c b/bin/gensquashfs/src/glob.c
index 3e2eabc..dbe93a2 100644
--- a/bin/gensquashfs/src/glob.c
+++ b/bin/gensquashfs/src/glob.c
@@ -69,7 +69,7 @@ int glob_files(fstree_t *fs, const char *filename, size_t line_num,
split_line_t *sep)
{
bool first_type_flag = true;
- dir_iterator_t *dir = NULL;
+ sqfs_dir_iterator_t *dir = NULL;
char *prefix = NULL;
dir_tree_cfg_t cfg;
tree_node_t *root;
diff --git a/bin/gensquashfs/src/mkfs.c b/bin/gensquashfs/src/mkfs.c
index 39329a6..a178066 100644
--- a/bin/gensquashfs/src/mkfs.c
+++ b/bin/gensquashfs/src/mkfs.c
@@ -168,7 +168,7 @@ int main(int argc, char **argv)
}
if (opt.infile == NULL) {
- dir_iterator_t *dir = NULL;
+ sqfs_dir_iterator_t *dir = NULL;
dir_tree_cfg_t cfg;
int ret;
diff --git a/bin/gensquashfs/src/mkfs.h b/bin/gensquashfs/src/mkfs.h
index 3378c05..5c5f02c 100644
--- a/bin/gensquashfs/src/mkfs.h
+++ b/bin/gensquashfs/src/mkfs.h
@@ -112,7 +112,7 @@ int fstree_from_file_stream(fstree_t *fs, sqfs_istream_t *file,
Returns 0 on success, prints to stderr on failure.
*/
-int fstree_from_dir(fstree_t *fs, dir_iterator_t *dir);
+int fstree_from_dir(fstree_t *fs, sqfs_dir_iterator_t *dir);
int fstree_sort_files(fstree_t *fs, sqfs_istream_t *sortfile);
diff --git a/bin/tar2sqfs/src/process_tarball.c b/bin/tar2sqfs/src/process_tarball.c
index 331936d..3b9365d 100644
--- a/bin/tar2sqfs/src/process_tarball.c
+++ b/bin/tar2sqfs/src/process_tarball.c
@@ -6,7 +6,7 @@
*/
#include "tar2sqfs.h"
-static int write_file(sqfs_writer_t *sqfs, dir_iterator_t *it,
+static int write_file(sqfs_writer_t *sqfs, sqfs_dir_iterator_t *it,
const sqfs_dir_entry_t *ent, tree_node_t *n)
{
int flags = 0, ret = 0;
@@ -40,7 +40,7 @@ static int write_file(sqfs_writer_t *sqfs, dir_iterator_t *it,
}
static int copy_xattr(sqfs_writer_t *sqfs, const char *filename,
- tree_node_t *node, dir_iterator_t *it)
+ tree_node_t *node, sqfs_dir_iterator_t *it)
{
sqfs_xattr_t *xattr, *list;
int ret;
@@ -91,8 +91,10 @@ fail:
return -1;
}
-static int create_node_and_repack_data(sqfs_writer_t *sqfs, dir_iterator_t *it,
- const sqfs_dir_entry_t *ent, const char *link)
+static int create_node_and_repack_data(sqfs_writer_t *sqfs,
+ sqfs_dir_iterator_t *it,
+ const sqfs_dir_entry_t *ent,
+ const char *link)
{
tree_node_t *node;
@@ -127,7 +129,7 @@ fail_errno:
return -1;
}
-static int set_root_attribs(sqfs_writer_t *sqfs, dir_iterator_t *it,
+static int set_root_attribs(sqfs_writer_t *sqfs, sqfs_dir_iterator_t *it,
const sqfs_dir_entry_t *ent)
{
if ((ent->flags & SQFS_DIR_ENTRY_FLAG_HARD_LINK) || !S_ISDIR(ent->mode)) {
@@ -150,7 +152,7 @@ static int set_root_attribs(sqfs_writer_t *sqfs, dir_iterator_t *it,
return 0;
}
-int process_tarball(dir_iterator_t *it, sqfs_writer_t *sqfs)
+int process_tarball(sqfs_dir_iterator_t *it, sqfs_writer_t *sqfs)
{
size_t rootlen = root_becomes == NULL ? 0 : strlen(root_becomes);
diff --git a/bin/tar2sqfs/src/tar2sqfs.c b/bin/tar2sqfs/src/tar2sqfs.c
index ae8b548..acb42e2 100644
--- a/bin/tar2sqfs/src/tar2sqfs.c
+++ b/bin/tar2sqfs/src/tar2sqfs.c
@@ -10,7 +10,7 @@ int main(int argc, char **argv)
{
sqfs_istream_t *input_file = NULL;
tar_iterator_opts topts = { 0 };
- dir_iterator_t *tar = NULL;
+ sqfs_dir_iterator_t *tar = NULL;
int status = EXIT_FAILURE;
sqfs_writer_t sqfs;
int ret;
diff --git a/bin/tar2sqfs/src/tar2sqfs.h b/bin/tar2sqfs/src/tar2sqfs.h
index 5dcfad7..d2049f2 100644
--- a/bin/tar2sqfs/src/tar2sqfs.h
+++ b/bin/tar2sqfs/src/tar2sqfs.h
@@ -35,6 +35,6 @@ extern size_t num_excludedirs;
void process_args(int argc, char **argv);
/* process_tarball.c */
-int process_tarball(dir_iterator_t *it, sqfs_writer_t *sqfs);
+int process_tarball(sqfs_dir_iterator_t *it, sqfs_writer_t *sqfs);
#endif /* TAR2SQFS_H */