diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-06-21 16:00:37 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-06-21 16:00:37 +0300 |
| commit | 16160386982a86e6ec7969c6c89707d38228f19e (patch) | |
| tree | 47052539a23ab7d6d2cf79392dd1e47de67bb2f1 /Zend/zend_execute_API.c | |
| parent | 67e23f4be3c01a389043ee97b98d6bcc703d3557 (diff) | |
| download | php-git-16160386982a86e6ec7969c6c89707d38228f19e.tar.gz | |
Added ZEND_ATTRIBUTE_FORMAT to some middind functions.
"%p" replaced by ZEND_LONG_FMT to avoid compilation warnings.
Fixed most incorrect use cases of format specifiers.
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index f7bce4f4e5..d292de19e4 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -1175,7 +1175,7 @@ ZEND_API ZEND_NORETURN void zend_timeout(int dummy) /* {{{ */ zend_set_timeout_ex(0, 1); #endif - zend_error_noreturn(E_ERROR, "Maximum execution time of %pd second%s exceeded", EG(timeout_seconds), EG(timeout_seconds) == 1 ? "" : "s"); + zend_error_noreturn(E_ERROR, "Maximum execution time of " ZEND_LONG_FMT " second%s exceeded", EG(timeout_seconds), EG(timeout_seconds) == 1 ? "" : "s"); } /* }}} */ @@ -1205,7 +1205,7 @@ static void zend_timeout_handler(int dummy) /* {{{ */ error_filename = "Unknown"; } - zend_spprintf(&log_buffer, 0, "\nFatal error: Maximum execution time of %pd+%pd seconds exceeded (terminated) in %s on line %d\n", EG(timeout_seconds), EG(hard_timeout), error_filename, error_lineno); + zend_spprintf(&log_buffer, 0, "\nFatal error: Maximum execution time of " ZEND_LONG_FMT "+" ZEND_LONG_FMT " seconds exceeded (terminated) in %s on line %d\n", EG(timeout_seconds), EG(hard_timeout), error_filename, error_lineno); write(2, log_buffer, strlen(log_buffer)); _exit(1); } |