From bcb5a6e74ac97004acc9a4937285f001b895e0d7 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 22 Sep 2019 16:10:52 +0200 Subject: Use inode structures in the data writer instead of fstree file info Changes are minor, but needs some temporary hacks in fstree again. Signed-off-by: David Oberhollenzer --- include/data_writer.h | 4 ++-- include/fstree.h | 2 ++ include/highlevel.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/data_writer.h b/include/data_writer.h index 4d5fa12..1ff0d69 100644 --- a/include/data_writer.h +++ b/include/data_writer.h @@ -84,7 +84,7 @@ int data_writer_sync(data_writer_t *data); Returns 0 on success, prints errors to stderr. */ -int write_data_from_file(data_writer_t *data, file_info_t *fi, +int write_data_from_file(data_writer_t *data, sqfs_inode_generic_t *inode, sqfs_file_t *file, int flags); /* @@ -98,7 +98,7 @@ int write_data_from_file(data_writer_t *data, file_info_t *fi, Returns 0 on success, prints errors to stderr. */ int write_data_from_file_condensed(data_writer_t *data, sqfs_file_t *file, - file_info_t *fi, + sqfs_inode_generic_t *inode, const sqfs_sparse_map_t *map, int flags); data_writer_stats_t *data_writer_get_stats(data_writer_t *data); diff --git a/include/fstree.h b/include/fstree.h index 8e35269..85e2258 100644 --- a/include/fstree.h +++ b/include/fstree.h @@ -78,6 +78,8 @@ struct file_info_t { uint64_t size; + void *user_ptr; + /* Number of bytes not written to disk because they are 0 */ uint64_t sparse; diff --git a/include/highlevel.h b/include/highlevel.h index 46a2330..b2bbd82 100644 --- a/include/highlevel.h +++ b/include/highlevel.h @@ -72,7 +72,7 @@ int compressor_cfg_init_options(sqfs_compressor_config_t *cfg, void compressor_print_help(E_SQFS_COMPRESSOR id); -sqfs_inode_generic_t *tree_node_to_inode(fstree_t *fs, sqfs_id_table_t *idtbl, +sqfs_inode_generic_t *tree_node_to_inode(sqfs_id_table_t *idtbl, tree_node_t *node); int inode_stat(const sqfs_tree_node_t *node, struct stat *sb); -- cgit v1.2.3