From 129e1758a5e2cf851f042e139fdd808a9be9ce94 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 15 Sep 2019 18:07:47 +0200 Subject: Move sparse_map_t to libsquashfs headers, rename it to sqfs_sparse_map_t Signed-off-by: David Oberhollenzer --- lib/sqfshelper/data_writer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/sqfshelper/data_writer.c') diff --git a/lib/sqfshelper/data_writer.c b/lib/sqfshelper/data_writer.c index edd1770..a6d0297 100644 --- a/lib/sqfshelper/data_writer.c +++ b/lib/sqfshelper/data_writer.c @@ -390,9 +390,9 @@ int write_data_from_file(data_writer_t *data, file_info_t *fi, return 0; } -static int check_map_valid(const sparse_map_t *map, file_info_t *fi) +static int check_map_valid(const sqfs_sparse_map_t *map, file_info_t *fi) { - const sparse_map_t *m; + const sqfs_sparse_map_t *m; uint64_t offset; if (map != NULL) { @@ -421,10 +421,10 @@ fail_map: } static int get_sparse_block(sqfs_block_t *blk, file_info_t *fi, int infd, - sparse_map_t **sparse_map, uint64_t offset, + sqfs_sparse_map_t **sparse_map, uint64_t offset, size_t diff) { - sparse_map_t *map = *sparse_map; + sqfs_sparse_map_t *map = *sparse_map; size_t start, count; while (map != NULL && map->offset < offset + diff) { @@ -451,7 +451,7 @@ static int get_sparse_block(sqfs_block_t *blk, file_info_t *fi, int infd, } int write_data_from_fd_condensed(data_writer_t *data, file_info_t *fi, - int infd, sparse_map_t *map, int flags) + int infd, sqfs_sparse_map_t *map, int flags) { uint32_t blk_flags = BLK_FIRST_BLOCK; size_t diff, i = 0; -- cgit v1.2.3