From 422d1665a2a744421b5911cbe8541370509bc4f5 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 14 Jan 2021 12:06:07 +0100 Subject: 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. --- ext/dba/dba.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/dba') diff --git a/ext/dba/dba.c b/ext/dba/dba.c index b3c9f4eeb2..b7bfecc77c 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -114,8 +114,8 @@ static size_t php_dba_make_key(zval *key, char **key_str, char **key_free) group = zend_hash_get_current_data_ex(Z_ARRVAL_P(key), &pos); zend_hash_move_forward_ex(Z_ARRVAL_P(key), &pos); name = zend_hash_get_current_data_ex(Z_ARRVAL_P(key), &pos); - convert_to_string_ex(group); - convert_to_string_ex(name); + convert_to_string(group); + convert_to_string(name); if (Z_STRLEN_P(group) == 0) { *key_str = Z_STRVAL_P(name); *key_free = NULL; -- cgit v1.2.1