aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-09-21 03:58:43 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-09-21 04:00:59 +0200
commit1bf363ba52025a0cf504b313878ea99c174a1683 (patch)
tree008dfad25d61e84a6730b03bf7606a7266f7dd85
parent544575bd09378dcf573e33a315628ecc193925e7 (diff)
Minor fstree related cleanup
- file list is no longer needed for statistics - the size field in the directory info structure is no longer in use - sqfs2tar, rdsquashfs and sqfsdiff no longer depend on libfstree.a Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
-rw-r--r--difftool/Makemodule.am2
-rw-r--r--include/fstree.h4
-rw-r--r--mkfs/mkfs.c4
-rw-r--r--tar/Makemodule.am2
-rw-r--r--tar/tar2sqfs.c4
-rw-r--r--unpack/Makemodule.am2
6 files changed, 5 insertions, 13 deletions
diff --git a/difftool/Makemodule.am b/difftool/Makemodule.am
index e64d23b..b38cd93 100644
--- a/difftool/Makemodule.am
+++ b/difftool/Makemodule.am
@@ -2,6 +2,6 @@ sqfsdiff_SOURCES = difftool/sqfsdiff.c difftool/sqfsdiff.h difftool/util.c
sqfsdiff_SOURCES += difftool/compare_dir.c difftool/node_compare.c
sqfsdiff_SOURCES += difftool/compare_files.c difftool/super.c
sqfsdiff_SOURCES += difftool/extract.c difftool/options.c
-sqfsdiff_LDADD = libsqfshelper.a libsquashfs.la libfstree.a libutil.la
+sqfsdiff_LDADD = libsqfshelper.a libsquashfs.la libutil.la
bin_PROGRAMS += sqfsdiff
diff --git a/include/fstree.h b/include/fstree.h
index f214501..8e35269 100644
--- a/include/fstree.h
+++ b/include/fstree.h
@@ -101,10 +101,6 @@ struct dir_info_t {
/* Linked list head for children in the directory */
tree_node_t *children;
- /* Size on disk. Computed and updated on the fly while writing
- directory meta data to disk. */
- uint64_t size;
-
/* Set to true for implicitly generated directories. */
bool created_implicitly;
};
diff --git a/mkfs/mkfs.c b/mkfs/mkfs.c
index cb65eda..9ebafc5 100644
--- a/mkfs/mkfs.c
+++ b/mkfs/mkfs.c
@@ -197,10 +197,8 @@ int main(int argc, char **argv)
if (padd_sqfs(outfile, super.bytes_used, opt.devblksz))
goto out_data;
- if (!opt.quiet) {
- fstree_gen_file_list(&fs);
+ if (!opt.quiet)
sqfs_print_statistics(&super, data_writer_get_stats(data));
- }
status = EXIT_SUCCESS;
out_data:
diff --git a/tar/Makemodule.am b/tar/Makemodule.am
index 11e4f67..e532fad 100644
--- a/tar/Makemodule.am
+++ b/tar/Makemodule.am
@@ -1,5 +1,5 @@
sqfs2tar_SOURCES = tar/sqfs2tar.c
-sqfs2tar_LDADD = libsqfshelper.a libsquashfs.la libtar.a libfstree.a libutil.la
+sqfs2tar_LDADD = libsqfshelper.a libsquashfs.la libtar.a libutil.la
tar2sqfs_SOURCES = tar/tar2sqfs.c
tar2sqfs_LDADD = libsqfshelper.a libsquashfs.la libtar.a libfstree.a libutil.la
diff --git a/tar/tar2sqfs.c b/tar/tar2sqfs.c
index 84d56f4..dd0f827 100644
--- a/tar/tar2sqfs.c
+++ b/tar/tar2sqfs.c
@@ -486,10 +486,8 @@ int main(int argc, char **argv)
if (padd_sqfs(outfile, super.bytes_used, devblksize))
goto out;
- if (!quiet) {
- fstree_gen_file_list(&fs);
+ if (!quiet)
sqfs_print_statistics(&super, data_writer_get_stats(data));
- }
status = EXIT_SUCCESS;
out:
diff --git a/unpack/Makemodule.am b/unpack/Makemodule.am
index 0dbd07f..5382e8e 100644
--- a/unpack/Makemodule.am
+++ b/unpack/Makemodule.am
@@ -2,6 +2,6 @@ rdsquashfs_SOURCES = unpack/rdsquashfs.c unpack/rdsquashfs.h
rdsquashfs_SOURCES += unpack/list_files.c unpack/options.c
rdsquashfs_SOURCES += unpack/restore_fstree.c unpack/describe.c
rdsquashfs_SOURCES += unpack/fill_files.c unpack/dump_xattrs.c
-rdsquashfs_LDADD = libsqfshelper.a libsquashfs.la libfstree.a libutil.la
+rdsquashfs_LDADD = libsqfshelper.a libsquashfs.la libutil.la
bin_PROGRAMS += rdsquashfs