com php-src: Added backwards compability with php_log_err by using macro: ext/standard/basic_functions.c main/main.c main/php.h
| From: | Anatol Belski | Date: | Thu, 02 Jun 2016 11:25:29 +0000 |
| Subject: | com php-src: Added backwards compability with php_log_err by using macro: ext/standard/basic_functions.c main/main.c main/php.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-92277@lists.php.net to get a copy of this message | ||
Commit: 0a04f6144884792e6b9fb28bc1b6cfe3772a446f
Author: Jani Ollikainen <jani.ollikainen@valve.fi> Wed, 6 Apr 2016 14:14:41 +0300
Committer: Anatol Belski <ab@php.net> Thu, 2 Jun 2016 13:25:29 +0200
Parents: 3edf7d960cb14f2ee45944e7c567af92af25bda1
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0a04f6144884792e6b9fb28bc1b6cfe3772a446f
Log:
Added backwards compability with php_log_err by using macro
Changed paths:
M ext/standard/basic_functions.c
M main/main.c
M main/php.h
Diff:
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 3f363d1..5fb5246 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -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;
diff --git a/main/main.c b/main/main.c
index 0bf50e0..cc4b30b 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 d9a387e..9e7fe46 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()