diff options
| author | Nathan Moinvaziri <nathan@nathanm.com> | 2020-07-03 20:37:11 -0700 |
|---|---|---|
| committer | Hans Kristian Rosbach <hk-github@circlestorm.org> | 2020-08-14 22:20:50 +0200 |
| commit | 9ee4f8a100057519b021a3a756741fa3d4664f7e (patch) | |
| tree | 9f46c83d46ba8a61a9eee668c1f8a46c25dec622 | |
| parent | 2928d96e2a950f81ade2ff198a11800d2168b983 (diff) | |
| download | Project-Tick-9ee4f8a100057519b021a3a756741fa3d4664f7e.tar.gz Project-Tick-9ee4f8a100057519b021a3a756741fa3d4664f7e.zip | |
Fixed many possible loss of data warnings where insert_string and quick_insert_string function used on Windows.
| -rw-r--r-- | functable.c | 16 | ||||
| -rw-r--r-- | functable.h | 4 | ||||
| -rw-r--r-- | insert_string_tpl.h | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/functable.c b/functable.c index a261a9cf12..cc1f070fda 100644 --- a/functable.c +++ b/functable.c @@ -15,19 +15,19 @@ #endif /* insert_string */ -extern Pos insert_string_c(deflate_state *const s, const Pos str, unsigned int count); +extern Pos insert_string_c(deflate_state *const s, const uint32_t str, uint32_t count); #ifdef X86_SSE42_CRC_HASH -extern Pos insert_string_sse4(deflate_state *const s, const Pos str, unsigned int count); +extern Pos insert_string_sse4(deflate_state *const s, const uint32_t str, uint32_t count); #elif defined(ARM_ACLE_CRC_HASH) -extern Pos insert_string_acle(deflate_state *const s, const Pos str, unsigned int count); +extern Pos insert_string_acle(deflate_state *const s, const uint32_t str, uint32_t count); #endif /* quick_insert_string */ -extern Pos quick_insert_string_c(deflate_state *const s, const Pos str); +extern Pos quick_insert_string_c(deflate_state *const s, const uint32_t str); #ifdef X86_SSE42_CRC_HASH -extern Pos quick_insert_string_sse4(deflate_state *const s, const Pos str); +extern Pos quick_insert_string_sse4(deflate_state *const s, const uint32_t str); #elif defined(ARM_ACLE_CRC_HASH) -extern Pos quick_insert_string_acle(deflate_state *const s, const Pos str); +extern Pos quick_insert_string_acle(deflate_state *const s, const uint32_t str); #endif /* slide_hash */ @@ -144,7 +144,7 @@ ZLIB_INTERNAL void cpu_check_features(void) } /* stub functions */ -ZLIB_INTERNAL Pos insert_string_stub(deflate_state *const s, const Pos str, unsigned int count) { +ZLIB_INTERNAL Pos insert_string_stub(deflate_state *const s, const uint32_t str, uint32_t count) { // Initialize default functable.insert_string = &insert_string_c; @@ -161,7 +161,7 @@ ZLIB_INTERNAL Pos insert_string_stub(deflate_state *const s, const Pos str, unsi return functable.insert_string(s, str, count); } -ZLIB_INTERNAL Pos quick_insert_string_stub(deflate_state *const s, const Pos str) { +ZLIB_INTERNAL Pos quick_insert_string_stub(deflate_state *const s, const uint32_t str) { functable.quick_insert_string = &quick_insert_string_c; #ifdef X86_SSE42_CRC_HASH diff --git a/functable.h b/functable.h index 45712424ed..dab313da20 100644 --- a/functable.h +++ b/functable.h @@ -9,8 +9,8 @@ #include "deflate.h" struct functable_s { - Pos (* insert_string) (deflate_state *const s, const Pos str, unsigned int count); - Pos (* quick_insert_string)(deflate_state *const s, const Pos str); + Pos (* insert_string) (deflate_state *const s, const uint32_t str, uint32_t count); + Pos (* quick_insert_string)(deflate_state *const s, const uint32_t str); uint32_t (* adler32) (uint32_t adler, const unsigned char *buf, size_t len); uint32_t (* crc32) (uint32_t crc, const unsigned char *buf, uint64_t len); void (* slide_hash) (deflate_state *s); diff --git a/insert_string_tpl.h b/insert_string_tpl.h index eee01070e9..127a7ca8d1 100644 --- a/insert_string_tpl.h +++ b/insert_string_tpl.h @@ -27,7 +27,7 @@ * of the hash chain (the most recent string with same hash key). Return * the previous length of the hash chain. */ -ZLIB_INTERNAL Pos QUICK_INSERT_STRING(deflate_state *const s, const Pos str) { +ZLIB_INTERNAL Pos QUICK_INSERT_STRING(deflate_state *const s, const uint32_t str) { Pos head; uint8_t *strstart = s->window + str; uint32_t val, hm, h = 0; @@ -60,7 +60,7 @@ ZLIB_INTERNAL Pos QUICK_INSERT_STRING(deflate_state *const s, const Pos str) { * input characters and the first MIN_MATCH bytes of str are valid * (except for the last MIN_MATCH-1 bytes of the input file). */ -ZLIB_INTERNAL Pos INSERT_STRING(deflate_state *const s, const Pos str, unsigned int count) { +ZLIB_INTERNAL Pos INSERT_STRING(deflate_state *const s, const uint32_t str, uint32_t count) { Pos idx, ret; uint8_t *strstart, *strend; |