summaryrefslogtreecommitdiff
path: root/mysys/my_compress.c
diff options
context:
space:
mode:
authorIgnacio Galarza <iggy@mysql.com>2009-02-13 11:41:47 -0500
committerIgnacio Galarza <iggy@mysql.com>2009-02-13 11:41:47 -0500
commit5b7347bda31b9d66cd78937e5dc339f553b9a736 (patch)
tree85b39362efeae16536a90f3a3624acd6916d4305 /mysys/my_compress.c
parent50b19265ffcf4e4708c86345a5c166c58dbdb523 (diff)
parent54fbbf9591e21cda9f7b26c2d795d88f51827f07 (diff)
downloadmariadb-git-5b7347bda31b9d66cd78937e5dc339f553b9a736.tar.gz
Bug#29125 Windows Server X64: so many compiler warnings
- Remove bothersome warning messages. This change focuses on the warnings that are covered by the ignore file: support-files/compiler_warnings.supp. - Strings are guaranteed to be max uint in length
Diffstat (limited to 'mysys/my_compress.c')
-rw-r--r--mysys/my_compress.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_compress.c b/mysys/my_compress.c
index 0d076e77c35..a3d9d56915e 100644
--- a/mysys/my_compress.c
+++ b/mysys/my_compress.c
@@ -67,7 +67,7 @@ uchar *my_compress_alloc(const uchar *packet, size_t *len, size_t *complen)
if (!(compbuf= (uchar *) my_malloc(*complen, MYF(MY_WME))))
return 0; /* Not enough memory */
- tmp_complen= *complen;
+ tmp_complen= (uint) *complen;
res= compress((Bytef*) compbuf, &tmp_complen, (Bytef*) packet, (uLong) *len);
*complen= tmp_complen;
@@ -118,7 +118,7 @@ my_bool my_uncompress(uchar *packet, size_t len, size_t *complen)
if (!compbuf)
DBUG_RETURN(1); /* Not enough memory */
- tmp_complen= *complen;
+ tmp_complen= (uint) *complen;
error= uncompress((Bytef*) compbuf, &tmp_complen, (Bytef*) packet,
(uLong) len);
*complen= tmp_complen;