diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-09-27 16:43:11 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-09-27 16:43:11 +0200 |
| commit | 625368eb5bcb9954ad190af50962e6b7c2fd9c4c (patch) | |
| tree | 48779d7e54b4fa3df83df39fff76b54d93aacedf /lib/sqfshelper | |
| parent | 720023d968b24fe358fd4cfb002d8572f6cc96e7 (diff) | |
Cleanup: remove most of the payload pointer magic from libfstree
Now that dir_info_t and file_info_t have reasonably small, use them in
tree_node_t directly instead of doing pointer arithmetic magic on the
payload area.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib/sqfshelper')
| -rw-r--r-- | lib/sqfshelper/serialize_fstree.c | 2 | ||||
| -rw-r--r-- | lib/sqfshelper/tree_node_to_inode.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqfshelper/serialize_fstree.c b/lib/sqfshelper/serialize_fstree.c index e012902..296f123 100644 --- a/lib/sqfshelper/serialize_fstree.c +++ b/lib/sqfshelper/serialize_fstree.c @@ -26,7 +26,7 @@ static sqfs_inode_generic_t *write_dir_entries(sqfs_dir_writer_t *dirw, if (sqfs_dir_writer_begin(dirw)) return NULL; - for (it = node->data.dir->children; it != NULL; it = it->next) { + for (it = node->data.dir.children; it != NULL; it = it->next) { ret = sqfs_dir_writer_add_entry(dirw, it->name, it->inode_num, it->inode_ref, it->mode); if (ret) diff --git a/lib/sqfshelper/tree_node_to_inode.c b/lib/sqfshelper/tree_node_to_inode.c index 5cb04a4..edcdee3 100644 --- a/lib/sqfshelper/tree_node_to_inode.c +++ b/lib/sqfshelper/tree_node_to_inode.c @@ -52,8 +52,8 @@ sqfs_inode_generic_t *tree_node_to_inode(sqfs_id_table_t *idtbl, size_t extra = 0; if (S_ISREG(node->mode)) { - inode = node->data.file->user_ptr; - node->data.file->user_ptr = NULL; + inode = node->data.file.user_ptr; + node->data.file.user_ptr = NULL; } else { if (S_ISLNK(node->mode)) extra = strlen(node->data.slink_target); |