From d57efdfa0b7420dabf97335ffe3a8b391b9f54b3 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer <david.oberhollenzer@sigma-star.at> Date: Fri, 20 Sep 2019 16:31:31 +0200 Subject: Remove sqfs reader & fstree usage from sqfsdiff Replace with direct usage of the dir reader and lower level data structures. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at> --- include/data_reader.h | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'include') diff --git a/include/data_reader.h b/include/data_reader.h index 63bd539..77bdd82 100644 --- a/include/data_reader.h +++ b/include/data_reader.h @@ -31,19 +31,6 @@ void data_reader_destroy(data_reader_t *data); int data_reader_dump(data_reader_t *data, const sqfs_inode_generic_t *inode, int outfd, bool allow_sparse); -/* - Use a file_info_t to locate and extract all blocks of the coresponding - file and its fragment, if it has one. The entire data is dumped to the - given file descriptor. - - If allow_sparse is true, try to truncate and seek forward on outfd if a - zero block is found. If false, always write blocks of zeros to outfd. - - Returns 0 on success, prints error messages to stderr on failure. - */ -int data_reader_dump_file(data_reader_t *data, file_info_t *fi, int outfd, - bool allow_sparse); - /* Read a chunk of data from a file. Starting from 'offset' into the uncompressed file, read 'size' bytes into 'buffer'. @@ -51,7 +38,8 @@ int data_reader_dump_file(data_reader_t *data, file_info_t *fi, int outfd, Returns the number of bytes read, 0 if EOF, -1 on failure. Prints an error message to stderr on failure. */ -ssize_t data_reader_read(data_reader_t *data, file_info_t *fi, +ssize_t data_reader_read(data_reader_t *data, + const sqfs_inode_generic_t *inode, uint64_t offset, void *buffer, size_t size); #endif /* DATA_READER_H */ -- cgit v1.2.3