libfstree: Remove external file_info_t declaration

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

1 files changed, 11 insertions, 14 deletions

diff --git a/include/fstree.h b/include/fstree.h
index 044bb48..1d427a4 100644
--- a/include/fstree.h
+++ b/include/fstree.h
@@ -23,7 +23,6 @@
 
 typedef struct fstree_defaults_t fstree_defaults_t;
 typedef struct tree_node_t tree_node_t;
-typedef struct file_info_t file_info_t;
 typedef struct fstree_t fstree_t;
 
 enum {
@@ -31,18 +30,6 @@ enum {
 	FLAG_FILE_ALREADY_MATCHED = 0x02,
 };
 
-/* Additional meta data stored in a tree_node_t for regular files. */
-struct file_info_t {
-	/* Path to the input file. */
-	char *input_file;
-
-	sqfs_inode_generic_t *inode;
-
-	/* used by sort file processing */
-	sqfs_s64 priority;
-	int flags;
-};
-
 /* A node in a file system tree */
 struct tree_node_t {
 	tree_node_t *next_by_type;
@@ -74,8 +61,18 @@ struct tree_node_t {
 
 	/* Type specific data. "target" pointer is into payload area below. */
 	union {
+		struct {
+			/* Path to the input file. */
+			char *input_file;
+
+			sqfs_inode_generic_t *inode;
+
+			/* used by sort file processing */
+			sqfs_s64 priority;
+			int flags;
+		} file;
+
 		tree_node_t *children;
-		file_info_t file;
 		char *target;
 		sqfs_u64 devno;
 		tree_node_t *target_node;