diff options
Diffstat (limited to 'ext/zip/zip_stream.c')
| -rw-r--r-- | ext/zip/zip_stream.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/zip/zip_stream.c b/ext/zip/zip_stream.c index f24a91ff85..bce62f5614 100644 --- a/ext/zip/zip_stream.c +++ b/ext/zip/zip_stream.c @@ -45,7 +45,7 @@ struct php_zip_stream_data_t { /* {{{ php_zip_ops_read */ -static size_t php_zip_ops_read(php_stream *stream, char *buf, size_t count) +static ssize_t php_zip_ops_read(php_stream *stream, char *buf, size_t count) { ssize_t n = 0; STREAM_DATA_FROM_STREAM(); @@ -65,7 +65,7 @@ static size_t php_zip_ops_read(php_stream *stream, char *buf, size_t count) php_error_docref(NULL, E_WARNING, "Zip stream error: %s", zip_error_strerror(err)); zip_error_fini(err); #endif - return 0; + return -1; } /* cast count to signed value to avoid possibly negative n * being cast to unsigned value */ @@ -75,15 +75,15 @@ static size_t php_zip_ops_read(php_stream *stream, char *buf, size_t count) self->cursor += n; } } - return (n < 1 ? 0 : (size_t)n); + return n; } /* }}} */ /* {{{ php_zip_ops_write */ -static size_t php_zip_ops_write(php_stream *stream, const char *buf, size_t count) +static ssize_t php_zip_ops_write(php_stream *stream, const char *buf, size_t count) { if (!stream) { - return 0; + return -1; } return count; |