Skip to content

Commit cfe4066

Browse files
committed
review: use STR_KEY_VAL zend loop
1 parent 4d7c50d commit cfe4066

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

agent/fw_drupal8.c

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -625,27 +625,24 @@ static bool nr_drupal_hook_attribute_instrument(zval* module_handler) {
625625
zval* class_val = NULL;
626626
nr_php_string_hash_key_t* method_key = NULL;
627627
zval* module_val = NULL;
628-
zend_ulong key_num = 0;
629628

630629
char* hookpath = NULL;
631630

632631
hook_implementation_map = nr_php_get_zval_object_property(
633632
module_handler, "hookImplementationsMap");
634633
if (hook_implementation_map) {
635634
if (nr_php_is_zval_valid_array(hook_implementation_map)) {
636-
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(hook_implementation_map), key_num,
637-
hook_key, hook_val) {
638-
(void)key_num;
635+
ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(hook_implementation_map),
636+
hook_key, hook_val) {
639637
if ((NULL == hook_key) || (0 == nr_php_is_zval_valid_array(hook_val))) {
640638
nrl_warning(NRL_FRAMEWORK,
641639
"hookImplementationsMap[hook = %s]: invalid value",
642640
NRSAFESTR(ZEND_STRING_VALUE(hook_key)));
643641
return false;
644642
}
645643

646-
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(hook_val), key_num, class_key,
647-
class_val) {
648-
(void)key_num;
644+
ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(hook_val), class_key,
645+
class_val) {
649646
if ((NULL == class_key)
650647
|| (0 == nr_php_is_zval_valid_array(class_val))) {
651648
nrl_warning(NRL_FRAMEWORK,
@@ -654,10 +651,8 @@ static bool nr_drupal_hook_attribute_instrument(zval* module_handler) {
654651
return false;
655652
}
656653

657-
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(class_val), key_num, method_key,
658-
module_val) {
659-
(void)key_num;
660-
654+
ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(class_val), method_key,
655+
module_val) {
661656
if ((NULL == method_key)
662657
|| (0 == nr_php_is_zval_valid_string(module_val))) {
663658
nrl_warning(NRL_FRAMEWORK,

0 commit comments

Comments
 (0)