diff options
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/fpm/fpm/fpm_log.c | 2 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_main.c | 4 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_signals.c | 2 | ||||
| -rw-r--r-- | sapi/fpm/fpm/zlog.c | 4 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg.h | 2 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_io.c | 2 |
6 files changed, 9 insertions, 7 deletions
diff --git a/sapi/fpm/fpm/fpm_log.c b/sapi/fpm/fpm/fpm_log.c index b74f47a340..5aad9a08c9 100644 --- a/sapi/fpm/fpm/fpm_log.c +++ b/sapi/fpm/fpm/fpm_log.c @@ -467,7 +467,7 @@ int fpm_log_write(char *log_format) /* {{{ */ if (!test && strlen(buffer) > 0) { buffer[len] = '\n'; - quiet_write(fpm_log_fd, buffer, len + 1); + write(fpm_log_fd, buffer, len + 1); } return 0; diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index 76b9298411..5adeb63b7a 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -1865,7 +1865,7 @@ consult the installation file that came with this distribution, or visit \n\ if (fpm_globals.send_config_pipe[1]) { int writeval = 0; zlog(ZLOG_DEBUG, "Sending \"0\" (error) to parent via fd=%d", fpm_globals.send_config_pipe[1]); - quiet_write(fpm_globals.send_config_pipe[1], &writeval, sizeof(writeval)); + write(fpm_globals.send_config_pipe[1], &writeval, sizeof(writeval)); close(fpm_globals.send_config_pipe[1]); } return FPM_EXIT_CONFIG; @@ -1874,7 +1874,7 @@ consult the installation file that came with this distribution, or visit \n\ if (fpm_globals.send_config_pipe[1]) { int writeval = 1; zlog(ZLOG_DEBUG, "Sending \"1\" (OK) to parent via fd=%d", fpm_globals.send_config_pipe[1]); - quiet_write(fpm_globals.send_config_pipe[1], &writeval, sizeof(writeval)); + write(fpm_globals.send_config_pipe[1], &writeval, sizeof(writeval)); close(fpm_globals.send_config_pipe[1]); } fpm_is_running = 1; diff --git a/sapi/fpm/fpm/fpm_signals.c b/sapi/fpm/fpm/fpm_signals.c index f80de5d09f..a637e69e71 100644 --- a/sapi/fpm/fpm/fpm_signals.c +++ b/sapi/fpm/fpm/fpm_signals.c @@ -174,7 +174,7 @@ static void sig_handler(int signo) /* {{{ */ saved_errno = errno; s = sig_chars[signo]; - quiet_write(sp[1], &s, sizeof(s)); + write(sp[1], &s, sizeof(s)); errno = saved_errno; } /* }}} */ diff --git a/sapi/fpm/fpm/zlog.c b/sapi/fpm/fpm/zlog.c index 1266be85e6..1659c77efc 100644 --- a/sapi/fpm/fpm/zlog.c +++ b/sapi/fpm/fpm/zlog.c @@ -186,11 +186,11 @@ void vzlog(const char *function, int line, int flags, const char *fmt, va_list a #endif { buf[len++] = '\n'; - quiet_write(zlog_fd > -1 ? zlog_fd : STDERR_FILENO, buf, len); + write(zlog_fd > -1 ? zlog_fd : STDERR_FILENO, buf, len); } if (zlog_fd != STDERR_FILENO && zlog_fd != -1 && !launched && (flags & ZLOG_LEVEL_MASK) >= ZLOG_NOTICE) { - quiet_write(STDERR_FILENO, buf, len); + write(STDERR_FILENO, buf, len); } } /* }}} */ diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h index 3df2be0aed..94c5471e22 100644 --- a/sapi/phpdbg/phpdbg.h +++ b/sapi/phpdbg/phpdbg.h @@ -113,6 +113,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; |