From c65d24eaa3671e61db7c2a3f28daeaf7c74ac758 Mon Sep 17 00:00:00 2001 From: Bob Weinand Date: Sun, 20 Nov 2016 14:14:46 +0100 Subject: Remove a few unused write warning (backport from master, oops)s --- sapi/phpdbg/phpdbg_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sapi/phpdbg/phpdbg_io.c') diff --git a/sapi/phpdbg/phpdbg_io.c b/sapi/phpdbg/phpdbg_io.c index b2f4ba7c0d..69417e3d0b 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]; - write(sock, ZEND_STRL("\r---Type to continue or q to quit---")); + quiet_write(sock, ZEND_STRL("\r---Type to continue or q to quit---")); phpdbg_consume_stdin_line(buf); if (*buf == 'q') { break; -- cgit v1.2.1 From ff5a65d26b139142c5e967582c369ef65b79adf8 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sun, 20 Nov 2016 19:02:40 +0100 Subject: Revert "Remove a few unused write warning (backport from master, oops)s" This reverts commit c65d24eaa3671e61db7c2a3f28daeaf7c74ac758. --- sapi/phpdbg/phpdbg_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sapi/phpdbg/phpdbg_io.c') 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 to continue or q to quit---")); + write(sock, ZEND_STRL("\r---Type to continue or q to quit---")); phpdbg_consume_stdin_line(buf); if (*buf == 'q') { break; -- cgit v1.2.1 From bc30206b8ad4975126bd36f48add769d0d9a221a Mon Sep 17 00:00:00 2001 From: Bob Weinand Date: Sun, 20 Nov 2016 19:18:50 +0100 Subject: Revert "Revert "Remove a few unused write warning"" This reverts commit ff5a65d26b139142c5e967582c369ef65b79adf8. (With zend_ prefix now) --- sapi/phpdbg/phpdbg_io.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sapi/phpdbg/phpdbg_io.c') diff --git a/sapi/phpdbg/phpdbg_io.c b/sapi/phpdbg/phpdbg_io.c index b2f4ba7c0d..65a14d0ccb 100644 --- a/sapi/phpdbg/phpdbg_io.c +++ b/sapi/phpdbg/phpdbg_io.c @@ -149,7 +149,7 @@ recv_once: #endif if (got_now == -1) { - quiet_write(PHPDBG_G(io)[PHPDBG_STDERR].fd, ZEND_STRL("Read operation timed out!\n")); + zend_quiet_write(PHPDBG_G(io)[PHPDBG_STDERR].fd, ZEND_STRL("Read operation timed out!\n")); return -1; } i -= got_now; @@ -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]; - write(sock, ZEND_STRL("\r---Type to continue or q to quit---")); + zend_quiet_write(sock, ZEND_STRL("\r---Type to continue or q to quit---")); phpdbg_consume_stdin_line(buf); if (*buf == 'q') { break; @@ -305,7 +305,7 @@ PHPDBG_API int phpdbg_create_listenable_socket(const char *addr, unsigned short wrote = snprintf(buf, 128, "Could not translate address '%s'", addr); buf[wrote] = '\0'; - quiet_write(PHPDBG_G(io)[PHPDBG_STDERR].fd, buf, strlen(buf)); + zend_quiet_write(PHPDBG_G(io)[PHPDBG_STDERR].fd, buf, strlen(buf)); return sock; } else { @@ -315,7 +315,7 @@ PHPDBG_API int phpdbg_create_listenable_socket(const char *addr, unsigned short wrote = snprintf(buf, 256, "Host '%s' not found. %s", addr, estrdup(gai_strerror(rc))); buf[wrote] = '\0'; - quiet_write(PHPDBG_G(io)[PHPDBG_STDERR].fd, buf, strlen(buf)); + zend_quiet_write(PHPDBG_G(io)[PHPDBG_STDERR].fd, buf, strlen(buf)); return sock; #ifndef PHP_WIN32 @@ -330,7 +330,7 @@ PHPDBG_API int phpdbg_create_listenable_socket(const char *addr, unsigned short wrote = sprintf(buf, "Unable to create socket"); buf[wrote] = '\0'; - quiet_write(PHPDBG_G(io)[PHPDBG_STDERR].fd, buf, strlen(buf)); + zend_quiet_write(PHPDBG_G(io)[PHPDBG_STDERR].fd, buf, strlen(buf)); return sock; } -- cgit v1.2.1