diff options
| author | twosee <twose@qq.com> | 2020-06-07 08:38:13 +0800 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-07 10:41:11 +0200 |
| commit | 7d6a0ba8088c9abbb490013d0ea7099a86adefa9 (patch) | |
| tree | 796d25925fc449eb1af92e44b0b666da4afaf093 /main/streams/streams.c | |
| parent | 1d8233877c654fc1915080817a710ceb972682dd (diff) | |
| download | php-git-7d6a0ba8088c9abbb490013d0ea7099a86adefa9.tar.gz | |
Fix expression warnings and break warnings
Close GH-5675.
Diffstat (limited to 'main/streams/streams.c')
| -rw-r--r-- | main/streams/streams.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c index 9762fa90e8..90475a8d90 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -245,7 +245,7 @@ PHPAPI void php_stream_wrapper_log_error(const php_stream_wrapper *wrapper, int vspprintf(&buffer, 0, fmt, args); va_end(args); - if (options & REPORT_ERRORS || wrapper == NULL) { + if ((options & REPORT_ERRORS) || wrapper == NULL) { php_error_docref(NULL, E_WARNING, "%s", buffer); efree(buffer); } else { @@ -703,7 +703,7 @@ PHPAPI ssize_t _php_stream_read(php_stream *stream, char *buf, size_t size) break; } - if (!stream->readfilters.head && (stream->flags & PHP_STREAM_FLAG_NO_BUFFER || stream->chunk_size == 1)) { + if (!stream->readfilters.head && ((stream->flags & PHP_STREAM_FLAG_NO_BUFFER) || stream->chunk_size == 1)) { toread = stream->ops->read(stream, buf, size); if (toread < 0) { /* Report an error if the read failed and we did not read any data @@ -2088,7 +2088,7 @@ PHPAPI php_stream *_php_stream_open_wrapper_ex(const char *path, const char *mod path_to_open = path; wrapper = php_stream_locate_url_wrapper(path, &path_to_open, options); - if (options & STREAM_USE_URL && (!wrapper || !wrapper->is_url)) { + if ((options & STREAM_USE_URL) && (!wrapper || !wrapper->is_url)) { php_error_docref(NULL, E_WARNING, "This function may only be used against URLs"); if (resolved_path) { zend_string_release_ex(resolved_path, 0); |