Move file extraction code to generic data_reader_t in libsquashfs.a

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

1 files changed, 2 insertions, 8 deletions

diff --git a/unpack/rdsquashfs.h b/unpack/rdsquashfs.h
index a615bb5..b927bab 100644
--- a/unpack/rdsquashfs.h
+++ b/unpack/rdsquashfs.h
@@ -3,7 +3,7 @@
 #define RDSQUASHFS_H
 
 #include "meta_reader.h"
-#include "frag_reader.h"
+#include "data_reader.h"
 #include "highlevel.h"
 #include "squashfs.h"
 #include "compress.h"
@@ -27,21 +27,15 @@ enum UNPACK_FLAGS {
 };
 
 typedef struct {
+	data_reader_t *data;
 	compressor_t *cmp;
-	size_t block_size;
-	frag_reader_t *frag;
 	int rdtree_flags;
 	int sqfsfd;
 	int flags;
-
-	void *buffer;
-	void *scratch;
 } unsqfs_info_t;
 
 void list_files(tree_node_t *node);
 
-int extract_file(file_info_t *fi, unsqfs_info_t *info, int outfd);
-
 int restore_fstree(const char *rootdir, tree_node_t *root,
 		   unsqfs_info_t *info);