diff options
| author | Jani Ollikainen <jani.ollikainen@valve.fi> | 2016-04-06 14:14:41 +0300 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-06-02 13:25:29 +0200 |
| commit | 0a04f6144884792e6b9fb28bc1b6cfe3772a446f (patch) | |
| tree | f1aa91514c1b92b004f33a308942b49bbc08051c /main | |
| parent | 3edf7d960cb14f2ee45944e7c567af92af25bda1 (diff) | |
| download | php-git-0a04f6144884792e6b9fb28bc1b6cfe3772a446f.tar.gz | |
Added backwards compability with php_log_err by using macro
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.c | 6 | ||||
| -rw-r--r-- | main/php.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/main/main.c b/main/main.c index 0bf50e01ac..cc4b30b462 100644 --- a/main/main.c +++ b/main/main.c @@ -607,9 +607,9 @@ PHPAPI int php_get_module_initialized(void) } /* }}} */ -/* {{{ php_log_err +/* {{{ php_log_err_with_severity */ -PHPAPI ZEND_COLD void php_log_err(char *log_message, int syslog_type_int) +PHPAPI ZEND_COLD void php_log_err_with_severity(char *log_message, int syslog_type_int) { int fd = -1; time_t error_time; @@ -1101,7 +1101,7 @@ static ZEND_COLD void php_error_cb(int type, const char *error_filename, const u } #endif spprintf(&log_buffer, 0, "PHP %s: %s in %s on line %d", error_type_str, buffer, error_filename, error_lineno); - php_log_err(log_buffer, syslog_type_int); + php_log_err_with_severity(log_buffer, syslog_type_int); efree(log_buffer); } diff --git a/main/php.h b/main/php.h index d9a387e964..9e7fe46790 100644 --- a/main/php.h +++ b/main/php.h @@ -280,7 +280,8 @@ PHPAPI size_t php_write(void *buf, size_t size); PHPAPI size_t php_printf(const char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 1, 2); PHPAPI int php_get_module_initialized(void); -PHPAPI ZEND_COLD void php_log_err(char *log_message, int syslog_type_int); +#define php_log_err(msg) php_log_err_with_serevity(msg, LOG_NOTICE) +PHPAPI ZEND_COLD void php_log_err_with_severity(char *log_message, int syslog_type_int); int Debug(char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 1, 2); int cfgparse(void); END_EXTERN_C() |