Skip to content

Commit 6b3d5b1

Browse files
committed
review: use STR_KEY_VAL zend loop
1 parent a68bd59 commit 6b3d5b1

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
@@ -622,27 +622,24 @@ static bool nr_drupal_hook_attribute_instrument(zval* module_handler) {
622622
zval* class_val = NULL;
623623
nr_php_string_hash_key_t* method_key = NULL;
624624
zval* module_val = NULL;
625-
zend_ulong key_num = 0;
626625

627626
char* hookpath = NULL;
628627

629628
hook_implementation_map = nr_php_get_zval_object_property(
630629
module_handler, "hookImplementationsMap");
631630
if (hook_implementation_map) {
632631
if (nr_php_is_zval_valid_array(hook_implementation_map)) {
633-
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(hook_implementation_map), key_num,
634-
hook_key, hook_val) {
635-
(void)key_num;
632+
ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(hook_implementation_map),
633+
hook_key, hook_val) {
636634
if ((NULL == hook_key) || (0 == nr_php_is_zval_valid_array(hook_val))) {
637635
nrl_warning(NRL_FRAMEWORK,
638636
"hookImplementationsMap[hook = %s]: invalid value",
639637
NRSAFESTR(ZEND_STRING_VALUE(hook_key)));
640638
return false;
641639
}
642640

643-
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(hook_val), key_num, class_key,
644-
class_val) {
645-
(void)key_num;
641+
ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(hook_val), class_key,
642+
class_val) {
646643
if ((NULL == class_key)
647644
|| (0 == nr_php_is_zval_valid_array(class_val))) {
648645
nrl_warning(NRL_FRAMEWORK,
@@ -651,10 +648,8 @@ static bool nr_drupal_hook_attribute_instrument(zval* module_handler) {
651648
return false;
652649
}
653650

654-
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(class_val), key_num, method_key,
655-
module_val) {
656-
(void)key_num;
657-
651+
ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(class_val), method_key,
652+
module_val) {
658653
if ((NULL == method_key)
659654
|| (0 == nr_php_is_zval_valid_string(module_val))) {
660655
nrl_warning(NRL_FRAMEWORK,

0 commit comments

Comments
 (0)