diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2021-01-14 12:06:07 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-01-14 12:11:11 +0100 |
| commit | 422d1665a2a744421b5911cbe8541370509bc4f5 (patch) | |
| tree | fe173f4da139019d71a7bc88ffacfa8cd8f870dc /main | |
| parent | 1b2aba285db488852844c2eac484d35569ec4442 (diff) | |
| download | php-git-422d1665a2a744421b5911cbe8541370509bc4f5.tar.gz | |
Make convert_to_*_ex simple aliases of convert_to_*
Historically, the _ex variants separated the zval first, if a
conversion was necessary. This distinction no longer makes sense
since PHP 7.
The only difference that was still left is that _ex checked whether
the type is the same first, but the usage of these macros did not
actually distinguish on whether such an inlined check is valuable
or not in a given context.
Also drop the unused convert_to_explicit_type macros.
Diffstat (limited to 'main')
| -rw-r--r-- | main/output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/output.c b/main/output.c index bdeca894f2..eef8ad3bfc 100644 --- a/main/output.c +++ b/main/output.c @@ -970,7 +970,7 @@ static inline php_output_handler_status_t php_output_handler_op(php_output_handl /* user handler may have returned TRUE */ status = PHP_OUTPUT_HANDLER_NO_DATA; if (Z_TYPE(retval) != IS_FALSE && Z_TYPE(retval) != IS_TRUE) { - convert_to_string_ex(&retval); + convert_to_string(&retval); if (Z_STRLEN(retval)) { context->out.data = estrndup(Z_STRVAL(retval), Z_STRLEN(retval)); context->out.used = Z_STRLEN(retval); |