php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Export zend_error_zstr_at()

Browse Source 
This is the formerly static function zend_error_impl(), which is
the core error handling implementation.
This commit is contained in:
Nikita Popov
2021-04-23 11:29:55 +02:00
parent dc7030300c
commit 78e1f190fc
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Zend/zend.c
+3 -3
View File
@@ -1315,7 +1315,7 @@ ZEND_API zval *zend_get_configuration_directive(zend_string *name) /* {{{ */
} \
} while (0)
static ZEND_COLD void zend_error_impl(
ZEND_API ZEND_COLD void zend_error_zstr_at(
int orig_type, zend_string *error_filename, uint32_t error_lineno, zend_string *message)
{
zval params[4];
@@ -1453,7 +1453,7 @@ static ZEND_COLD void zend_error_va_list(
const char *format, va_list args)
{
zend_string *message = zend_vstrpprintf(0, format, args);
zend_error_impl(orig_type, error_filename, error_lineno, message);
zend_error_zstr_at(orig_type, error_filename, error_lineno, message);
zend_string_release(message);
}
@@ -1570,7 +1570,7 @@ ZEND_API ZEND_COLD void zend_error_zstr(int type, zend_string *message) {
zend_string *filename;
uint32_t lineno;
get_filename_lineno(type, &filename, &lineno);
zend_error_impl(type, filename, lineno, message);
zend_error_zstr_at(type, filename, lineno, message);
}
ZEND_API ZEND_COLD void zend_throw_error(zend_class_entry *exception_ce, const char *format, ...) /* {{{ */
Zend/zend.h
+1
View File
@@ -333,6 +333,7 @@ ZEND_API ZEND_COLD void zend_error_unchecked(int type, const char *format, ...);
ZEND_API ZEND_COLD void zend_error_at(int type, zend_string *filename, uint32_t lineno, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 4, 5);
ZEND_API ZEND_COLD ZEND_NORETURN void zend_error_at_noreturn(int type, zend_string *filename, uint32_t lineno, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 4, 5);
ZEND_API ZEND_COLD void zend_error_zstr(int type, zend_string *message);
ZEND_API ZEND_COLD void zend_error_zstr_at(int type, zend_string *filename, uint32_t lineno, zend_string *message);
ZEND_API ZEND_COLD void zend_throw_error(zend_class_entry *exception_ce, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
ZEND_API ZEND_COLD void zend_type_error(const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 1, 2);