From 40232f4bd4d7e8e001f7d1e8f120606f59b2c147 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Fri, 27 Sep 2019 18:15:40 +0200 Subject: 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 --- lib/sqfs/comp/gzip.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lib/sqfs/comp/gzip.c') diff --git a/lib/sqfs/comp/gzip.c b/lib/sqfs/comp/gzip.c index 0c6f944..3dd8d10 100644 --- a/lib/sqfs/comp/gzip.c +++ b/lib/sqfs/comp/gzip.c @@ -16,9 +16,9 @@ #include "internal.h" typedef struct { - uint32_t level; - uint16_t window; - uint16_t strategies; + sqfs_u32 level; + sqfs_u16 window; + sqfs_u16 strategies; } gzip_options_t; typedef struct { @@ -106,8 +106,8 @@ static int flag_to_zlib_strategy(int flag) return 0; } -static int find_strategy(gzip_compressor_t *gzip, const uint8_t *in, - size_t size, uint8_t *out, size_t outsize) +static int find_strategy(gzip_compressor_t *gzip, const sqfs_u8 *in, + size_t size, sqfs_u8 *out, size_t outsize) { int ret, strategy, selected = Z_DEFAULT_STRATEGY; size_t i, length, minlength = 0; @@ -148,8 +148,8 @@ static int find_strategy(gzip_compressor_t *gzip, const uint8_t *in, return selected; } -static ssize_t gzip_do_block(sqfs_compressor_t *base, const uint8_t *in, - size_t size, uint8_t *out, size_t outsize) +static ssize_t gzip_do_block(sqfs_compressor_t *base, const sqfs_u8 *in, + size_t size, sqfs_u8 *out, size_t outsize) { gzip_compressor_t *gzip = (gzip_compressor_t *)base; int ret, strategy = 0; -- cgit v1.2.3