Skip to content

Commit 977e9ef

Browse files
committed
rename validation fn
1 parent fda25fe commit 977e9ef

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

agent/fw_drupal8.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,8 @@ NR_PHP_WRAPPER(nr_drupal94_invoke_all_with_clean) {
605605
NR_PHP_WRAPPER_END
606606
#endif // OAPI
607607

608-
static bool nr_validate_key_val_arr(nr_php_string_hash_key_t* key, zval* val) {
608+
static bool nr_is_invalid_key_val_arr(nr_php_string_hash_key_t* key,
609+
zval* val) {
609610
if (NULL == key || 0 == ZEND_STRING_LEN(key)
610611
|| 0 == nr_php_is_zval_valid_array(val)
611612
|| 0 == zend_hash_num_elements(Z_ARRVAL_P(val))) {
@@ -646,14 +647,14 @@ static bool nr_drupal_hook_attribute_instrument(zval* module_handler) {
646647

647648
ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(hook_implementation_map), hook_key,
648649
hook_val) {
649-
if (nr_validate_key_val_arr(hook_key, hook_val)) {
650+
if (nr_is_invalid_key_val_arr(hook_key, hook_val)) {
650651
nrl_warning(NRL_FRAMEWORK,
651652
"hookImplementationsMap[hook]: invalid key or value");
652653
return false;
653654
}
654655

655656
ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(hook_val), class_key, class_val) {
656-
if (nr_validate_key_val_arr(class_key, class_val)) {
657+
if (nr_is_invalid_key_val_arr(class_key, class_val)) {
657658
nrl_warning(NRL_FRAMEWORK,
658659
"hookImplementationsMap[class]: invalid key or value");
659660
return false;

0 commit comments

Comments
 (0)