From: Aaron Boxer <boxerab@gmail.com>
Date: Tue, 20 Apr 2021 22:03:32 +0000 (-0400)
Subject: crc: fix three conversion warnings
X-Git-Tag: 2.0.3~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc7719dbe979237b6348f7e3fdd9edd9921fae3e;p=thirdparty%2Fzlib-ng.git

crc: fix three conversion warnings
---

diff --git a/arch/x86/crc_folding.c b/arch/x86/crc_folding.c
index 918bd946..49cdc993 100644
--- a/arch/x86/crc_folding.c
+++ b/arch/x86/crc_folding.c
@@ -186,7 +186,7 @@ static void partial_fold(const size_t len, __m128i *xmm_crc0, __m128i *xmm_crc1,
 
     const __m128i xmm_fold4 = _mm_set_epi32( 0x00000001, 0x54442bd4,
                                              0x00000001, 0xc6e41596);
-    const __m128i xmm_mask3 = _mm_set1_epi32(0x80808080);
+    const __m128i xmm_mask3 = _mm_set1_epi32((int32_t)0x80808080);
 
     __m128i xmm_shl, xmm_shr, xmm_tmp1, xmm_tmp2, xmm_tmp3;
     __m128i xmm_a0_0, xmm_a0_1;
@@ -358,7 +358,7 @@ Z_INTERNAL void crc_fold_copy(deflate_state *const s, unsigned char *dst, const
     memcpy(dst, partial_buf, len);
 
 partial:
-    partial_fold(len, &xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3, &xmm_crc_part);
+    partial_fold((size_t)len, &xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3, &xmm_crc_part);
 done:
     /* CRC_SAVE */
     _mm_storeu_si128((__m128i *)s->crc0 + 0, xmm_crc0);
@@ -450,7 +450,7 @@ uint32_t Z_INTERNAL crc_fold_512to32(deflate_state *const s) {
     xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_crc2);
     xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_crc1);
 
-    crc = _mm_extract_epi32(xmm_crc3, 2);
+    crc = (uint32_t)_mm_extract_epi32(xmm_crc3, 2);
     return ~crc;
 }