php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 17:38:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added backwards compability with php_log_err by using macro

Browse Source
This commit is contained in:
Jani Ollikainen
2016-04-06 14:14:41 +03:00
committed by Anatol Belski
parent 3edf7d960c
commit 0a04f61448
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/standard/basic_functions.c
+1 -1
View File
@@ -4704,7 +4704,7 @@ PHPAPI int _php_error_log_ex(int opt_err, char *message, size_t message_len, cha
break;
default:
php_log_err(message, LOG_NOTICE);
php_log_err_with_severity(message, LOG_NOTICE);
break;
}
return SUCCESS;
main/main.c
+3 -3
View File
@@ -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);
}
main/php.h
+2 -1
View File
@@ -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()