Skip to content

Convert all php_error_docref0 to php_error_docref #4394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Convert all php_error_docref0 to php_error_docref #4394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ext/dba/dba_lmdb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,14 +251,14 @@ DBA_FIRSTKEY_FUNC(lmdb)

rc = mdb_txn_begin(LMDB_IT(env), NULL, MDB_RDONLY, &LMDB_IT(txn));
if (rc) {
php_error_docref0(NULL, E_WARNING, "%s", mdb_strerror(rc));
php_error_docref(NULL, E_WARNING, "%s", mdb_strerror(rc));
return NULL;
}

rc = mdb_cursor_open(LMDB_IT(txn), LMDB_IT(dbi), &LMDB_IT(cur));
if (rc) {
mdb_txn_abort(LMDB_IT(txn));
php_error_docref0(NULL, E_WARNING, "%s", mdb_strerror(rc));
php_error_docref(NULL, E_WARNING, "%s", mdb_strerror(rc));
return NULL;
}

Expand All @@ -268,7 +268,7 @@ DBA_FIRSTKEY_FUNC(lmdb)
mdb_cursor_close(LMDB_IT(cur));
LMDB_IT(cur) = NULL;
if (MDB_NOTFOUND != rc) {
php_error_docref0(NULL, E_WARNING, "%s", mdb_strerror(rc));
php_error_docref(NULL, E_WARNING, "%s", mdb_strerror(rc));
}
return NULL;
}
Expand All @@ -291,7 +291,7 @@ DBA_NEXTKEY_FUNC(lmdb)

rc = mdb_txn_renew(LMDB_IT(txn));
if (rc) {
php_error_docref0(NULL, E_WARNING, "%s", mdb_strerror(rc));
php_error_docref(NULL, E_WARNING, "%s", mdb_strerror(rc));
return NULL;
}

Expand All @@ -301,7 +301,7 @@ DBA_NEXTKEY_FUNC(lmdb)
mdb_cursor_close(LMDB_IT(cur));
LMDB_IT(cur) = NULL;
if (MDB_NOTFOUND != rc) {
php_error_docref0(NULL, E_WARNING, "%s", mdb_strerror(rc));
php_error_docref(NULL, E_WARNING, "%s", mdb_strerror(rc));
}
return NULL;
}
Expand All @@ -327,7 +327,7 @@ DBA_SYNC_FUNC(lmdb)

rc = mdb_env_sync(LMDB_IT(env), 1);
if (rc) {
php_error_docref0(NULL, E_WARNING, "%s", mdb_strerror(rc));
php_error_docref(NULL, E_WARNING, "%s", mdb_strerror(rc));
return FAILURE;
}

Expand Down
2 changes: 1 addition & 1 deletion ext/intl/idn/idn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ static void php_intl_idn_handoff(INTERNAL_FUNCTION_PARAMETERS, int mode)

if (idna_info != NULL) {
if (variant == INTL_IDN_VARIANT_2003) {
php_error_docref0(NULL, E_NOTICE,
php_error_docref(NULL, E_NOTICE,
"4 arguments were provided, but INTL_IDNA_VARIANT_2003 only "
"takes 3 - extra argument ignored");
} else {
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/timezone/timezone_class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ U_CFUNC void timezone_register_IntlTimeZone_class(void)
TimeZone_ce_ptr = zend_register_internal_class(&ce);
if (!TimeZone_ce_ptr) {
//can't happen now without bigger problems before
php_error_docref0(NULL, E_ERROR,
php_error_docref(NULL, E_ERROR,
"IntlTimeZone: class registration has failed.");
return;
}
Expand Down
4 changes: 2 additions & 2 deletions ext/intl/transliterator/transliterator_class.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ static zval *Transliterator_read_property( zval *object, zval *member, int type,
( zend_binary_strcmp( "id", sizeof( "id" ) - 1,
Z_STRVAL_P( member ), Z_STRLEN_P( member ) ) == 0 ) )
{
php_error_docref0( NULL, E_WARNING, "The property \"id\" is read-only" );
php_error_docref(NULL, E_WARNING, "The property \"id\" is read-only" );
retval = &EG( uninitialized_zval );
}
else
Expand Down Expand Up @@ -271,7 +271,7 @@ static zval *Transliterator_write_property( zval *object, zval *member, zval *va
( zend_binary_strcmp( "id", sizeof( "id" ) - 1,
Z_STRVAL_P( member ), Z_STRLEN_P( member ) ) == 0 ) )
{
php_error_docref0( NULL, E_WARNING, "The property \"id\" is read-only" );
php_error_docref(NULL, E_WARNING, "The property \"id\" is read-only" );
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/transliterator/transliterator_methods.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ PHP_FUNCTION( transliterator_transliterate )
if( res == FAILURE )
{
zend_string *message = intl_error_get_message( NULL );
php_error_docref0( NULL, E_WARNING, "Could not create "
php_error_docref(NULL, E_WARNING, "Could not create "
"transliterator with ID \"%s\" (%s)", Z_STRVAL_P( arg1 ), ZSTR_VAL(message) );
zend_string_free( message );
ZVAL_UNDEF(&tmp_object);
Expand Down
2 changes: 1 addition & 1 deletion ext/sockets/conversions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ static void do_to_zval_err(res_context *ctx, const char *fmt, ...)
void err_msg_dispose(struct err_s *err)
{
if (err->msg != NULL) {
php_error_docref0(NULL, err->level, "%s", err->msg);
php_error_docref(NULL, err->level, "%s", err->msg);
if (err->should_free) {
efree(err->msg);
}
Expand Down
10 changes: 5 additions & 5 deletions ext/sockets/sendrecvmsg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ inline ssize_t sendmsg(int sockfd, const struct msghdr *msg, int flags)
#define LONG_CHECK_VALID_INT(l) \
do { \
if ((l) < INT_MIN && (l) > INT_MAX) { \
php_error_docref0(NULL, E_WARNING, "The value " ZEND_LONG_FMT " does not fit inside " \
php_error_docref(NULL, E_WARNING, "The value " ZEND_LONG_FMT " does not fit inside " \
"the boundaries of a native integer", (l)); \
return; \
} \
Expand Down Expand Up @@ -292,22 +292,22 @@ PHP_FUNCTION(socket_cmsg_space)
LONG_CHECK_VALID_INT(n);

if (n < 0) {
php_error_docref0(NULL, E_WARNING, "The third argument "
php_error_docref(NULL, E_WARNING, "The third argument "
"cannot be negative");
return;
}

entry = get_ancillary_reg_entry(level, type);
if (entry == NULL) {
php_error_docref0(NULL, E_WARNING, "The pair level " ZEND_LONG_FMT "/type " ZEND_LONG_FMT " is "
php_error_docref(NULL, E_WARNING, "The pair level " ZEND_LONG_FMT "/type " ZEND_LONG_FMT " is "
"not supported by PHP", level, type);
return;
}

if (entry->var_el_size > 0 && n > (zend_long)((ZEND_LONG_MAX - entry->size -
CMSG_SPACE(0) - 15L) / entry->var_el_size)) {
/* the -15 is to account for any padding CMSG_SPACE may add after the data */
php_error_docref0(NULL, E_WARNING, "The value for the "
php_error_docref(NULL, E_WARNING, "The value for the "
"third argument (" ZEND_LONG_FMT ") is too large", n);
return;
}
Expand All @@ -331,7 +331,7 @@ int php_do_setsockopt_ipv6_rfc3542(php_socket *php_sock, int level, int optname,
case IPV6_PKTINFO:
#ifdef PHP_WIN32
if (Z_TYPE_P(arg4) == IS_ARRAY) {
php_error_docref0(NULL, E_WARNING, "Windows does not "
php_error_docref(NULL, E_WARNING, "Windows does not "
"support sticky IPV6_PKTINFO");
return FAILURE;
} else {
Expand Down
2 changes: 1 addition & 1 deletion ext/standard/html.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1187,7 +1187,7 @@ PHPAPI zend_string *php_escape_html_entities_ex(unsigned char *old, size_t oldle

if (all) { /* replace with all named entities */
if (CHARSET_PARTIAL_SUPPORT(charset)) {
php_error_docref0(NULL, E_STRICT, "Only basic entities "
php_error_docref(NULL, E_STRICT, "Only basic entities "
"substitution is supported for multi-byte encodings other than UTF-8; "
"functionality is equivalent to htmlspecialchars");
}
Expand Down
6 changes: 3 additions & 3 deletions main/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1163,9 +1163,9 @@ PHPAPI ZEND_COLD void php_verror(const char *docref, const char *params, int typ
}
/* }}} */

/* {{{ php_error_docref0 */
/* See: CODING_STANDARDS.md for details. */
PHPAPI ZEND_COLD void php_error_docref0(const char *docref, int type, const char *format, ...)
/* {{{ php_error_docref */
/* Generate an error which links to docref or the php.net documentation if docref is NULL */
PHPAPI ZEND_COLD void php_error_docref(const char *docref, int type, const char *format, ...)
{
va_list args;

Expand Down
4 changes: 1 addition & 3 deletions main/php.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ static inline ZEND_ATTRIBUTE_DEPRECATED void php_std_error_handling() {}
PHPAPI ZEND_COLD void php_verror(const char *docref, const char *params, int type, const char *format, va_list args) PHP_ATTRIBUTE_FORMAT(printf, 4, 0);

/* PHPAPI void php_error(int type, const char *format, ...); */
PHPAPI ZEND_COLD void php_error_docref0(const char *docref, int type, const char *format, ...)
PHPAPI ZEND_COLD void php_error_docref(const char *docref, int type, const char *format, ...)
PHP_ATTRIBUTE_FORMAT(printf, 3, 4);
PHPAPI ZEND_COLD void php_error_docref1(const char *docref, const char *param1, int type, const char *format, ...)
PHP_ATTRIBUTE_FORMAT(printf, 4, 5);
Expand All @@ -350,8 +350,6 @@ PHPAPI ZEND_COLD void php_win32_docref2_from_error(DWORD error, const char *para
#endif
END_EXTERN_C()

#define php_error_docref php_error_docref0

#define zenderror phperror
#define zendlex phplex

Expand Down