aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-07-02 19:31:51 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-07-03 09:31:51 +0200
commitec593e0b94656a5481f82ee0f33728ced297ac48 (patch)
treec4172c686b628ff3d0c198dc05aa0db83239d6bd /bin
parent181815fb432007f5e8b8cbd15c3f66beea04e601 (diff)
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 <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'bin')
-rw-r--r--bin/gensquashfs/src/fstree_from_dir.c2
-rw-r--r--bin/gensquashfs/src/fstree_from_file.c10
-rw-r--r--bin/gensquashfs/src/glob.c2
-rw-r--r--bin/gensquashfs/src/mkfs.h2
-rw-r--r--bin/tar2sqfs/src/process_tarball.c8
5 files changed, 12 insertions, 12 deletions
diff --git a/bin/gensquashfs/src/fstree_from_dir.c b/bin/gensquashfs/src/fstree_from_dir.c
index 6af4637..fe0a022 100644
--- a/bin/gensquashfs/src/fstree_from_dir.c
+++ b/bin/gensquashfs/src/fstree_from_dir.c
@@ -9,7 +9,7 @@
int fstree_from_dir(fstree_t *fs, dir_iterator_t *dir)
{
for (;;) {
- dir_entry_t *ent = NULL;
+ sqfs_dir_entry_t *ent = NULL;
tree_node_t *n = NULL;
char *extra = NULL;
diff --git a/bin/gensquashfs/src/fstree_from_file.c b/bin/gensquashfs/src/fstree_from_file.c
index d06fcfd..16fa516 100644
--- a/bin/gensquashfs/src/fstree_from_file.c
+++ b/bin/gensquashfs/src/fstree_from_file.c
@@ -29,7 +29,7 @@ static int read_u32(const char *str, sqfs_u32 *out, sqfs_u32 base)
}
static int add_generic(fstree_t *fs, const char *filename, size_t line_num,
- dir_entry_t *ent, split_line_t *line)
+ sqfs_dir_entry_t *ent, split_line_t *line)
{
const char *msg = NULL, *arg = line->count > 0 ? line->args[0] : NULL;
@@ -51,7 +51,7 @@ fail:
}
static int add_device(fstree_t *fs, const char *filename, size_t line_num,
- dir_entry_t *ent, split_line_t *line)
+ sqfs_dir_entry_t *ent, split_line_t *line)
{
sqfs_u32 maj, min;
@@ -93,7 +93,7 @@ fail_generic:
}
static int add_file(fstree_t *fs, const char *filename, size_t line_num,
- dir_entry_t *ent, split_line_t *line)
+ sqfs_dir_entry_t *ent, split_line_t *line)
{
if (line->count == 0)
line->args[line->count++] = ent->name;
@@ -108,7 +108,7 @@ static const struct callback_t {
bool need_extra;
bool allow_root;
int (*callback)(fstree_t *fs, const char *filename, size_t line_num,
- dir_entry_t *ent, split_line_t *line);
+ sqfs_dir_entry_t *ent, split_line_t *line);
} file_list_hooks[] = {
{ "dir", S_IFDIR, 0, false, true, add_generic },
{ "slink", S_IFLNK, 0, true, false, add_generic },
@@ -127,7 +127,7 @@ static int handle_line(fstree_t *fs, const char *filename, size_t line_num,
const struct callback_t *cb = NULL;
unsigned int glob_flags = 0;
sqfs_u32 uid, gid, mode;
- dir_entry_t *ent = NULL;
+ sqfs_dir_entry_t *ent = NULL;
const char *msg = NULL;
bool is_glob = false;
char *path;
diff --git a/bin/gensquashfs/src/glob.c b/bin/gensquashfs/src/glob.c
index 656baee..3e2eabc 100644
--- a/bin/gensquashfs/src/glob.c
+++ b/bin/gensquashfs/src/glob.c
@@ -64,7 +64,7 @@ static bool set_scan_flag(const char *arg, dir_tree_cfg_t *cfg)
}
int glob_files(fstree_t *fs, const char *filename, size_t line_num,
- const dir_entry_t *ent,
+ const sqfs_dir_entry_t *ent,
const char *basepath, unsigned int glob_flags,
split_line_t *sep)
{
diff --git a/bin/gensquashfs/src/mkfs.h b/bin/gensquashfs/src/mkfs.h
index ed5246d..3378c05 100644
--- a/bin/gensquashfs/src/mkfs.h
+++ b/bin/gensquashfs/src/mkfs.h
@@ -117,7 +117,7 @@ int fstree_from_dir(fstree_t *fs, dir_iterator_t *dir);
int fstree_sort_files(fstree_t *fs, sqfs_istream_t *sortfile);
int glob_files(fstree_t *fs, const char *filename, size_t line_num,
- const dir_entry_t *ent,
+ const sqfs_dir_entry_t *ent,
const char *basepath, unsigned int glob_flags,
split_line_t *extra);
diff --git a/bin/tar2sqfs/src/process_tarball.c b/bin/tar2sqfs/src/process_tarball.c
index a2a4360..ecb9095 100644
--- a/bin/tar2sqfs/src/process_tarball.c
+++ b/bin/tar2sqfs/src/process_tarball.c
@@ -7,7 +7,7 @@
#include "tar2sqfs.h"
static int write_file(sqfs_writer_t *sqfs, dir_iterator_t *it,
- const dir_entry_t *ent, tree_node_t *n)
+ const sqfs_dir_entry_t *ent, tree_node_t *n)
{
int flags = 0, ret = 0;
sqfs_ostream_t *out;
@@ -92,7 +92,7 @@ fail:
}
static int create_node_and_repack_data(sqfs_writer_t *sqfs, dir_iterator_t *it,
- const dir_entry_t *ent, const char *link)
+ const sqfs_dir_entry_t *ent, const char *link)
{
tree_node_t *node;
@@ -128,7 +128,7 @@ fail_errno:
}
static int set_root_attribs(sqfs_writer_t *sqfs, dir_iterator_t *it,
- const dir_entry_t *ent)
+ const sqfs_dir_entry_t *ent)
{
if ((ent->flags & DIR_ENTRY_FLAG_HARD_LINK) || !S_ISDIR(ent->mode)) {
fprintf(stderr, "'%s' is not a directory!\n", ent->name);
@@ -156,7 +156,7 @@ int process_tarball(dir_iterator_t *it, sqfs_writer_t *sqfs)
for (;;) {
bool skip = false, is_root = false, is_prefixed = true;
- dir_entry_t *ent = NULL;
+ sqfs_dir_entry_t *ent = NULL;
char *link = NULL;
int ret;