Skip to content

Commit 28dab5f

Browse files
authored
Remove docref1/docref2 (#22742)
1 parent ae487f4 commit 28dab5f

3 files changed

Lines changed: 3 additions & 33 deletions

File tree

UPGRADING.INTERNALS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ PHP 8.6 INTERNALS UPGRADE NOTES
8080
directly.
8181
. The {_}php_stream_fopen_with_path() functions have been removed as they are
8282
unused.
83+
. The php_error_docref1() and php_error_docref2() functions have been
84+
removed, instead rely on the error_include_args INI option to show the
85+
arguments to functions in a consistent manner.
8386

8487
- Changed:
8588
. Internal functions that return by reference are now expected to

main/main.c

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1258,35 +1258,6 @@ PHPAPI ZEND_COLD void php_error_docref_unchecked(const char *docref, int type, c
12581258
}
12591259
/* }}} */
12601260

1261-
/* {{{ php_error_docref1 */
1262-
/* See: CODING_STANDARDS.md for details. */
1263-
PHPAPI ZEND_COLD void php_error_docref1(const char *docref, const char *param1, int type, const char *format, ...)
1264-
{
1265-
va_list args;
1266-
1267-
va_start(args, format);
1268-
php_verror(docref, param1, type, format, args);
1269-
va_end(args);
1270-
}
1271-
/* }}} */
1272-
1273-
/* {{{ php_error_docref2 */
1274-
/* See: CODING_STANDARDS.md for details. */
1275-
PHPAPI ZEND_COLD void php_error_docref2(const char *docref, const char *param1, const char *param2, int type, const char *format, ...)
1276-
{
1277-
char *params;
1278-
va_list args;
1279-
1280-
spprintf(&params, 0, "%s,%s", param1, param2);
1281-
va_start(args, format);
1282-
php_verror(docref, params ? params : "...", type, format, args);
1283-
va_end(args);
1284-
if (params) {
1285-
efree(params);
1286-
}
1287-
}
1288-
/* }}} */
1289-
12901261
/* {{{ php_html_puts */
12911262
PHPAPI void php_html_puts(const char *str, size_t size)
12921263
{

main/php.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -305,10 +305,6 @@ PHPAPI ZEND_COLD void php_verror(const char *docref, const char *params, int typ
305305
PHPAPI ZEND_COLD void php_error_docref(const char *docref, int type, const char *format, ...)
306306
PHP_ATTRIBUTE_FORMAT(printf, 3, 4);
307307
PHPAPI ZEND_COLD void php_error_docref_unchecked(const char *docref, int type, const char *format, ...);
308-
PHPAPI ZEND_COLD void php_error_docref1(const char *docref, const char *param1, int type, const char *format, ...)
309-
PHP_ATTRIBUTE_FORMAT(printf, 4, 5);
310-
PHPAPI ZEND_COLD void php_error_docref2(const char *docref, const char *param1, const char *param2, int type, const char *format, ...)
311-
PHP_ATTRIBUTE_FORMAT(printf, 5, 6);
312308
END_EXTERN_C()
313309

314310
#define zenderror phperror

0 commit comments

Comments
 (0)