Remodel libtar/tar2sqfs to read data from an istream_t

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

2 files changed, 3 insertions, 15 deletions

diff --git a/include/common.h b/include/common.h
index 8639558..ea27edc 100644
--- a/include/common.h
+++ b/include/common.h
@@ -114,9 +114,6 @@ int sqfs_data_reader_dump(const char *name, sqfs_data_reader_t *data,
 			  const sqfs_inode_generic_t *inode,
 			  ostream_t *fp, size_t block_size);
 
-sqfs_file_t *sqfs_get_stdin_file(FILE *fp, const sparse_map_t *map,
-				 sqfs_u64 size);
-
 int write_data_from_file(const char *filename, sqfs_block_processor_t *data,
 			 sqfs_inode_generic_t **inode,
 			 sqfs_file_t *file, int flags);
diff --git a/include/tar.h b/include/tar.h
index 38ec656..10e7b52 100644
--- a/include/tar.h
+++ b/include/tar.h
@@ -131,12 +131,12 @@ int write_hard_link(ostream_t *fp, const struct stat *sb, const char *name,
 		    const char *target, unsigned int counter);
 
 /* calcuate and skip the zero padding */
-int skip_padding(FILE *fp, sqfs_u64 size);
+int skip_padding(istream_t *fp, sqfs_u64 size);
 
 /* round up to block size and skip the entire entry */
-int skip_entry(FILE *fp, sqfs_u64 size);
+int skip_entry(istream_t *fp, sqfs_u64 size);
 
-int read_header(FILE *fp, tar_header_decoded_t *out);
+int read_header(istream_t *fp, tar_header_decoded_t *out);
 
 void free_xattr_list(tar_xattr_t *list);
 
@@ -148,13 +148,4 @@ void clear_header(tar_header_decoded_t *hdr);
 */
 int padd_file(ostream_t *fp, sqfs_u64 size);
 
-
-/*
-  A wrapper around the read() system call. It retries the read if it is
-  interrupted by a signal or less than the desired size was read. Returns 0
-  on success. Writes to stderr on failure using 'errstr' as a perror style
-  error prefix.
-*/
-int read_retry(const char *errstr, FILE *fp, void *buffer, size_t size);
-
 #endif /* TAR_H */