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 /ext/mysqli/mysqli_api.c | |
| 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 'ext/mysqli/mysqli_api.c')
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 4f6b6c881f..1670a65054 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -858,12 +858,12 @@ PHP_FUNCTION(mysqli_stmt_execute) stmt->stmt->params[i].buffer_length = Z_STRLEN_P(param); break; case MYSQL_TYPE_DOUBLE: - convert_to_double_ex(param); + convert_to_double(param); stmt->stmt->params[i].buffer = &Z_DVAL_P(param); break; case MYSQL_TYPE_LONGLONG: case MYSQL_TYPE_LONG: - convert_to_long_ex(param); + convert_to_long(param); stmt->stmt->params[i].buffer = &Z_LVAL_P(param); break; default: @@ -1714,7 +1714,7 @@ PHP_FUNCTION(mysqli_options) } break; case IS_LONG: - convert_to_long_ex(mysql_value); + convert_to_long(mysql_value); break; default: break; |