diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2008-01-13 00:30:38 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2008-01-13 00:30:38 +0200 |
| commit | 89ff50d4296e849cec70799f7bda8c6217601867 (patch) | |
| tree | 73de231121178e9ffeb7e50acc0dfa24a5b2557d /mysys/my_compress.c | |
| parent | 0cccfe30cc5ba9e6b02b90eeec73753b5136f892 (diff) | |
| download | mariadb-git-89ff50d4296e849cec70799f7bda8c6217601867.tar.gz | |
Fixed compiler warnings
Fixed type that caused windows builds to fail
include/my_alloc.h:
Use size_t for memory areas instead of uint
mysys/mf_iocache.c:
Fixed compiler warnings by adding casts
mysys/my_compress.c:
Fixed compiler warnings by adding casts
mysys/my_getsystime.c:
Fixed typo
mysys/my_static.h:
Use size_t for memory areas
mysys/safemalloc.c:
Use size_t for memory areas
storage/maria/ma_bitmap.c:
Fixed compiler warnings by adding casts
storage/maria/ma_blockrec.c:
Fixed compiler warnings by adding casts
storage/maria/ma_cache.c:
Use size_t for memory areas
storage/maria/ma_info.c:
Use size_t for memory areas
storage/maria/ma_key.c:
Fixed compiler warnings by adding casts
storage/maria/ma_locking.c:
Fixed compiler warnings by adding casts
storage/maria/ma_open.c:
Fixed compiler warnings by adding casts
storage/maria/ma_packrec.c:
Fixed compiler warnings by fixing type for variable
storage/maria/ma_statrec.c:
Fixed compiler warnings by adding casts
storage/maria/ma_write.c:
Fixed compiler warnings by adding casts
storage/maria/maria_def.h:
Use size_t for memory areas
storage/myisam/mi_search.c:
Fixed compiler warnings by adding casts
Diffstat (limited to 'mysys/my_compress.c')
| -rw-r--r-- | mysys/my_compress.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_compress.c b/mysys/my_compress.c index ab17b10e72c..70d2960f48e 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= (uLongf) *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= (uLongf) *complen; error= uncompress((Bytef*) compbuf, &tmp_complen, (Bytef*) packet, (uLong) len); *complen= tmp_complen; |