diff options
| author | Nikita Popov <nikic@php.net> | 2016-11-20 19:02:40 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-11-20 19:09:05 +0100 |
| commit | ff5a65d26b139142c5e967582c369ef65b79adf8 (patch) | |
| tree | 75822bfec1d0b36118a0d9f28b5e11293bf0e7d0 /sapi/fpm | |
| parent | c65d24eaa3671e61db7c2a3f28daeaf7c74ac758 (diff) | |
| download | php-git-ff5a65d26b139142c5e967582c369ef65b79adf8.tar.gz | |
Revert "Remove a few unused write warning (backport from master, oops)s"
This reverts commit c65d24eaa3671e61db7c2a3f28daeaf7c74ac758.
Diffstat (limited to 'sapi/fpm')
| -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 |
4 files changed, 6 insertions, 6 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); } } /* }}} */ |