Skip to content

Commit b06eb82

Browse files
committed
streams: embed php_stream_wrapper_log_error_internal()
As it now only has a single usage
1 parent 1f7abed commit b06eb82

1 file changed

Lines changed: 6 additions & 14 deletions

File tree

main/streams/stream_errors.c

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -696,30 +696,22 @@ static void php_stream_wrapper_log_store_error(zend_string *message, zend_enum_S
696696
zend_llist_add_element(list, &entry);
697697
}
698698

699-
static void php_stream_wrapper_log_error_internal(const php_stream_wrapper *wrapper,
699+
PHPAPI void php_stream_wrapper_log_error(const php_stream_wrapper *wrapper,
700700
php_stream_context *context, int options, int severity, bool terminating,
701-
zend_enum_StreamErrorCode code, char *param, const char *fmt, va_list args)
701+
zend_enum_StreamErrorCode code, const char *fmt, ...)
702702
{
703+
va_list args;
704+
va_start(args, fmt);
703705
zend_string *message = vstrpprintf(0, fmt, args);
704706
const char *wrapper_name = PHP_STREAM_ERROR_WRAPPER_NAME(wrapper);
705707

706708
if (options & REPORT_ERRORS) {
707709
php_stream_wrapper_error_internal(
708-
wrapper_name, context, NULL, options, severity, terminating, code, param, message);
710+
wrapper_name, context, NULL, options, severity, terminating, code, NULL, message);
709711
} else {
710712
php_stream_wrapper_log_store_error(
711-
message, code, wrapper_name, param, severity, terminating);
713+
message, code, wrapper_name, NULL, severity, terminating);
712714
}
713-
}
714-
715-
PHPAPI void php_stream_wrapper_log_error(const php_stream_wrapper *wrapper,
716-
php_stream_context *context, int options, int severity, bool terminating,
717-
zend_enum_StreamErrorCode code, const char *fmt, ...)
718-
{
719-
va_list args;
720-
va_start(args, fmt);
721-
php_stream_wrapper_log_error_internal(
722-
wrapper, context, options, severity, terminating, code, NULL, fmt, args);
723715
va_end(args);
724716
}
725717

0 commit comments

Comments
 (0)