aboutsummaryrefslogtreecommitdiff
path: root/tar
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-09-27 18:15:40 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-09-27 18:15:40 +0200
commit40232f4bd4d7e8e001f7d1e8f120606f59b2c147 (patch)
tree5d763f4f22a487fd2e669efe0970615096f1f5fd /tar
parentf6904a98bffe0bce5fc6aac408c141a25c0e05ab (diff)
Cleanup: replace fixed with data types with typedefs
This is a fully automated search and replace, i.e. I ran this: git grep -l uint8_t | xargs sed -i 's/uint8_t/sqfs_u8/g' git grep -l uint16_t | xargs sed -i 's/uint16_t/sqfs_u16/g' git grep -l uint32_t | xargs sed -i 's/uint32_t/sqfs_u32/g' git grep -l uint64_t | xargs sed -i 's/uint64_t/sqfs_u64/g' git grep -l int8_t | xargs sed -i 's/int8_t/sqfs_s8/g' git grep -l int16_t | xargs sed -i 's/int16_t/sqfs_s16/g' git grep -l int32_t | xargs sed -i 's/int32_t/sqfs_s32/g' git grep -l int64_t | xargs sed -i 's/int64_t/sqfs_s64/g' and than added the appropriate definitions to sqfs/predef.h The whole point being better compatibillity with platforms that may not have an stdint.h with the propper definitions. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'tar')
-rw-r--r--tar/sqfs2tar.c2
-rw-r--r--tar/tar2sqfs.c10
2 files changed, 6 insertions, 6 deletions
diff --git a/tar/sqfs2tar.c b/tar/sqfs2tar.c
index 1afbedf..10c4d24 100644
--- a/tar/sqfs2tar.c
+++ b/tar/sqfs2tar.c
@@ -189,7 +189,7 @@ static int get_xattrs(const sqfs_inode_generic_t *inode, tar_xattr_t **out)
sqfs_xattr_value_t *value;
sqfs_xattr_entry_t *key;
sqfs_xattr_id_t desc;
- uint32_t index;
+ sqfs_u32 index;
size_t i;
if (xr == NULL)
diff --git a/tar/tar2sqfs.c b/tar/tar2sqfs.c
index 45b71bb..1175273 100644
--- a/tar/tar2sqfs.c
+++ b/tar/tar2sqfs.c
@@ -223,26 +223,26 @@ fail_arg:
}
static int write_file(tar_header_decoded_t *hdr, file_info_t *fi,
- sqfs_data_writer_t *data, uint64_t filesize)
+ sqfs_data_writer_t *data, sqfs_u64 filesize)
{
const sparse_map_t *it;
sqfs_inode_generic_t *inode;
size_t max_blk_count;
sqfs_file_t *file;
- uint64_t sum;
+ sqfs_u64 sum;
int ret;
max_blk_count = filesize / block_size;
if (filesize % block_size)
++max_blk_count;
- inode = alloc_flex(sizeof(*inode), sizeof(uint32_t), max_blk_count);
+ inode = alloc_flex(sizeof(*inode), sizeof(sqfs_u32), max_blk_count);
if (inode == NULL) {
perror("creating file inode");
return -1;
}
- inode->block_sizes = (uint32_t *)inode->extra;
+ inode->block_sizes = (sqfs_u32 *)inode->extra;
inode->base.type = SQFS_INODE_FILE;
sqfs_inode_set_file_size(inode, filesize);
sqfs_inode_set_frag_location(inode, 0xFFFFFFFF, 0xFFFFFFFF);
@@ -339,7 +339,7 @@ fail_errno:
static int process_tar_ball(fstree_t *fs, sqfs_data_writer_t *data)
{
tar_header_decoded_t hdr;
- uint64_t offset, count;
+ sqfs_u64 offset, count;
sparse_map_t *m;
bool skip;
int ret;