Skip to content

Commit 13bf672

Browse files
committed
reflection: Use zend_hash_str_find_ptr_lc() where possible
1 parent e025f2a commit 13bf672

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

ext/reflection/php_reflection.c

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1432,13 +1432,7 @@ static void reflection_extension_factory_ex(zval *object, zend_module_entry *mod
14321432
static void reflection_extension_factory(zval *object, const char *name_str)
14331433
{
14341434
size_t name_len = strlen(name_str);
1435-
zend_string *lcname;
1436-
struct _zend_module_entry *module;
1437-
1438-
lcname = zend_string_alloc(name_len, 0);
1439-
zend_str_tolower_copy(ZSTR_VAL(lcname), name_str, name_len);
1440-
module = zend_hash_find_ptr(&module_registry, lcname);
1441-
zend_string_efree(lcname);
1435+
struct _zend_module_entry *module = zend_hash_str_find_ptr_lc(&module_registry, name_str, name_len);
14421436
if (!module) {
14431437
return;
14441438
}
@@ -6643,28 +6637,22 @@ ZEND_METHOD(ReflectionProperty, isFinal)
66436637
ZEND_METHOD(ReflectionExtension, __construct)
66446638
{
66456639
zval *object;
6646-
char *lcname;
66476640
reflection_object *intern;
66486641
zend_module_entry *module;
66496642
char *name_str;
66506643
size_t name_len;
6651-
ALLOCA_FLAG(use_heap)
66526644

66536645
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name_str, &name_len) == FAILURE) {
66546646
RETURN_THROWS();
66556647
}
66566648

66576649
object = ZEND_THIS;
66586650
intern = Z_REFLECTION_P(object);
6659-
lcname = do_alloca(name_len + 1, use_heap);
6660-
zend_str_tolower_copy(lcname, name_str, name_len);
6661-
if ((module = zend_hash_str_find_ptr(&module_registry, lcname, name_len)) == NULL) {
6662-
free_alloca(lcname, use_heap);
6651+
if ((module = zend_hash_str_find_ptr_lc(&module_registry, name_str, name_len)) == NULL) {
66636652
zend_throw_exception_ex(reflection_exception_ptr, 0,
66646653
"Extension \"%s\" does not exist", name_str);
66656654
RETURN_THROWS();
66666655
}
6667-
free_alloca(lcname, use_heap);
66686656
zval *prop_name = reflection_prop_name(object);
66696657
zval_ptr_dtor(prop_name);
66706658
ZVAL_STRING(prop_name, module->name);

0 commit comments

Comments
 (0)