Move sparse_map_t to libsquashfs headers, rename it to sqfs_sparse_map_t

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

6 files changed, 15 insertions, 15 deletions

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;
diff --git a/lib/tar/cleanup.c b/lib/tar/cleanup.c
index 2f814bf..3c1d0e9 100644
--- a/lib/tar/cleanup.c
+++ b/lib/tar/cleanup.c
@@ -8,9 +8,9 @@
 
 #include "internal.h"
 
-void free_sparse_list(sparse_map_t *sparse)
+void free_sparse_list(sqfs_sparse_map_t *sparse)
 {
-	sparse_map_t *old;
+	sqfs_sparse_map_t *old;
 
 	while (sparse != NULL) {
 		old = sparse;
diff --git a/lib/tar/internal.h b/lib/tar/internal.h
index d95ef52..bc9a3a8 100644
--- a/lib/tar/internal.h
+++ b/lib/tar/internal.h
@@ -55,11 +55,11 @@ void update_checksum(tar_header_t *hdr);
 
 bool is_checksum_valid(const tar_header_t *hdr);
 
-sparse_map_t *read_sparse_map(const char *line);
+sqfs_sparse_map_t *read_sparse_map(const char *line);
 
-sparse_map_t *read_gnu_old_sparse(int fd, tar_header_t *hdr);
+sqfs_sparse_map_t *read_gnu_old_sparse(int fd, tar_header_t *hdr);
 
-void free_sparse_list(sparse_map_t *sparse);
+void free_sparse_list(sqfs_sparse_map_t *sparse);
 
 void free_xattr_list(tar_xattr_t *list);
 
diff --git a/lib/tar/read_header.c b/lib/tar/read_header.c
index 63de699..a874972 100644
--- a/lib/tar/read_header.c
+++ b/lib/tar/read_header.c
@@ -77,7 +77,7 @@ static tar_xattr_t *mkxattr(const char *key, size_t keylen,
 static int read_pax_header(int fd, uint64_t entsize, unsigned int *set_by_pax,
 			   tar_header_decoded_t *out)
 {
-	sparse_map_t *sparse_last = NULL, *sparse;
+	sqfs_sparse_map_t *sparse_last = NULL, *sparse;
 	uint64_t field, offset = 0, num_bytes = 0;
 	char *buffer, *line, *key, *ptr, *value;
 	tar_xattr_t *xattr;
diff --git a/lib/tar/read_sparse_map.c b/lib/tar/read_sparse_map.c
index 0779b96..981a808 100644
--- a/lib/tar/read_sparse_map.c
+++ b/lib/tar/read_sparse_map.c
@@ -8,9 +8,9 @@
 
 #include "internal.h"
 
-sparse_map_t *read_sparse_map(const char *line)
+sqfs_sparse_map_t *read_sparse_map(const char *line)
 {
-	sparse_map_t *last = NULL, *list = NULL, *ent = NULL;
+	sqfs_sparse_map_t *last = NULL, *list = NULL, *ent = NULL;
 
 	do {
 		ent = calloc(1, sizeof(*ent));
diff --git a/lib/tar/read_sparse_map_old.c b/lib/tar/read_sparse_map_old.c
index 5891bdb..7fb4cb3 100644
--- a/lib/tar/read_sparse_map_old.c
+++ b/lib/tar/read_sparse_map_old.c
@@ -8,9 +8,9 @@
 
 #include "internal.h"
 
-sparse_map_t *read_gnu_old_sparse(int fd, tar_header_t *hdr)
+sqfs_sparse_map_t *read_gnu_old_sparse(int fd, tar_header_t *hdr)
 {
-	sparse_map_t *list = NULL, *end = NULL, *node;
+	sqfs_sparse_map_t *list = NULL, *end = NULL, *node;
 	gnu_sparse_t sph;
 	uint64_t off, sz;
 	int i;