diff options
| author | Nikita Popov <nikic@php.net> | 2016-11-20 19:10:03 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-11-20 19:10:03 +0100 |
| commit | c58378619b34b1a15fbbf5500095d9ca99e59e90 (patch) | |
| tree | f10562fcb906b3994b8fded8216abb60821f2cce /sapi/phpdbg | |
| parent | b7fee22e73f403acba9e7c1fff12c23f51139a75 (diff) | |
| parent | ff5a65d26b139142c5e967582c369ef65b79adf8 (diff) | |
| download | php-git-c58378619b34b1a15fbbf5500095d9ca99e59e90.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'sapi/phpdbg')
| -rw-r--r-- | sapi/phpdbg/phpdbg.h | 2 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_io.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h index cf591a8a4e..84041b125c 100644 --- a/sapi/phpdbg/phpdbg.h +++ b/sapi/phpdbg/phpdbg.h @@ -116,6 +116,8 @@ #define memcpy(...) memcpy_tmp(__VA_ARGS__) #endif +#define quiet_write(...) ZEND_IGNORE_VALUE(write(__VA_ARGS__)) + #if !defined(PHPDBG_WEBDATA_TRANSFER_H) && !defined(PHPDBG_WEBHELPER_H) #ifdef ZTS diff --git a/sapi/phpdbg/phpdbg_io.c b/sapi/phpdbg/phpdbg_io.c index 69417e3d0b..b2f4ba7c0d 100644 --- a/sapi/phpdbg/phpdbg_io.c +++ b/sapi/phpdbg/phpdbg_io.c @@ -203,7 +203,7 @@ static int phpdbg_output_pager(int sock, const char *ptr, int len) { if (memchr(p, '\n', endp - p)) { char buf[PHPDBG_MAX_CMD]; - quiet_write(sock, ZEND_STRL("\r---Type <return> to continue or q <return> to quit---")); + write(sock, ZEND_STRL("\r---Type <return> to continue or q <return> to quit---")); phpdbg_consume_stdin_line(buf); if (*buf == 'q') { break; |