From: Anatol Belski Date: Fri, 19 Sep 2014 10:00:41 +0000 (+0200) Subject: fix signed/unsigned warning and add a note X-Git-Tag: POST_NATIVE_TLS_MERGE^2~194 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ede6eca2b2f927ee7d42fbe36885fdabc621b692;p=php fix signed/unsigned warning and add a note --- diff --git a/ext/zlib/zlib_fopen_wrapper.c b/ext/zlib/zlib_fopen_wrapper.c index 713a6ecfb2..948065a86d 100644 --- a/ext/zlib/zlib_fopen_wrapper.c +++ b/ext/zlib/zlib_fopen_wrapper.c @@ -37,13 +37,14 @@ static size_t php_gziop_read(php_stream *stream, char *buf, size_t count TSRMLS_ struct php_gz_stream_data_t *self = (struct php_gz_stream_data_t *) stream->abstract; int read; + /* XXX this needs to be looped for the case count > UINT_MAX */ read = gzread(self->gz_file, buf, count); if (gzeof(self->gz_file)) { stream->eof = 1; } - return (read < 0) ? 0 : read; + return (size_t)((read < 0) ? 0 : read); } static size_t php_gziop_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC) @@ -51,9 +52,10 @@ static size_t php_gziop_write(php_stream *stream, const char *buf, size_t count struct php_gz_stream_data_t *self = (struct php_gz_stream_data_t *) stream->abstract; int wrote; + /* XXX this needs to be looped for the case count > UINT_MAX */ wrote = gzwrite(self->gz_file, (char *) buf, count); - return (wrote < 0) ? 0 : wrote; + return (size_t)((wrote < 0) ? 0 : wrote); } static int php_gziop_seek(php_stream *stream, zend_off_t offset, int whence, zend_off_t *newoffs TSRMLS_DC)