Skip to content

Commit faefa68

Browse files
committed
rename validation fn
1 parent 808910b commit faefa68

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
@@ -608,7 +608,8 @@ NR_PHP_WRAPPER(nr_drupal94_invoke_all_with_clean) {
608608
NR_PHP_WRAPPER_END
609609
#endif // OAPI
610610

611-
static bool nr_validate_key_val_arr(nr_php_string_hash_key_t* key, zval* val) {
611+
static bool nr_is_invalid_key_val_arr(nr_php_string_hash_key_t* key,
612+
zval* val) {
612613
if (NULL == key || 0 == ZEND_STRING_LEN(key)
613614
|| 0 == nr_php_is_zval_valid_array(val)
614615
|| 0 == zend_hash_num_elements(Z_ARRVAL_P(val))) {
@@ -649,14 +650,14 @@ static bool nr_drupal_hook_attribute_instrument(zval* module_handler) {
649650

650651
ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(hook_implementation_map), hook_key,
651652
hook_val) {
652-
if (nr_validate_key_val_arr(hook_key, hook_val)) {
653+
if (nr_is_invalid_key_val_arr(hook_key, hook_val)) {
653654
nrl_warning(NRL_FRAMEWORK,
654655
"hookImplementationsMap[hook]: invalid key or value");
655656
return false;
656657
}
657658

658659
ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(hook_val), class_key, class_val) {
659-
if (nr_validate_key_val_arr(class_key, class_val)) {
660+
if (nr_is_invalid_key_val_arr(class_key, class_val)) {
660661
nrl_warning(NRL_FRAMEWORK,
661662
"hookImplementationsMap[class]: invalid key or value");
662663
return false;

0 commit comments

Comments
 (0)