From e165fb864fe86eda398a14713cf38924cc537adc Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sat, 14 Sep 2019 17:57:58 +0200 Subject: Remove fstree file flags As a side effect, this requires the data writer to keep track of statistics. Signed-off-by: David Oberhollenzer --- lib/sqfshelper/tree_node_from_inode.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'lib/sqfshelper/tree_node_from_inode.c') diff --git a/lib/sqfshelper/tree_node_from_inode.c b/lib/sqfshelper/tree_node_from_inode.c index fee191b..f5b643c 100644 --- a/lib/sqfshelper/tree_node_from_inode.c +++ b/lib/sqfshelper/tree_node_from_inode.c @@ -38,18 +38,10 @@ static size_t compute_size(sqfs_inode_generic_t *inode, const char *name) return size; } -static void copy_block_sizes(sqfs_inode_generic_t *inode, tree_node_t *out, - size_t block_size) +static void copy_block_sizes(sqfs_inode_generic_t *inode, tree_node_t *out) { size_t i; - if ((out->data.file->size % block_size) != 0) { - if (out->data.file->fragment != 0xFFFFFFFF && - out->data.file->fragment_offset != 0xFFFFFFFF) { - out->data.file->flags |= FILE_FLAG_HAS_FRAGMENT; - } - } - out->name += inode->num_file_blocks * sizeof(out->data.file->block_size[0]); @@ -59,8 +51,7 @@ static void copy_block_sizes(sqfs_inode_generic_t *inode, tree_node_t *out, tree_node_t *tree_node_from_inode(sqfs_inode_generic_t *inode, const sqfs_id_table_t *idtbl, - const char *name, - size_t block_size) + const char *name) { tree_node_t *out; @@ -112,7 +103,7 @@ tree_node_t *tree_node_from_inode(sqfs_inode_generic_t *inode, out->data.file->fragment_offset = inode->data.file.fragment_offset; - copy_block_sizes(inode, out, block_size); + copy_block_sizes(inode, out); break; case SQFS_INODE_EXT_FILE: out->data.file = (file_info_t *)out->payload; @@ -125,7 +116,7 @@ tree_node_t *tree_node_from_inode(sqfs_inode_generic_t *inode, out->data.file->fragment_offset = inode->data.file_ext.fragment_offset; - copy_block_sizes(inode, out, block_size); + copy_block_sizes(inode, out); break; case SQFS_INODE_SLINK: case SQFS_INODE_EXT_SLINK: -- cgit v1.2.3