Skip to content

Commit d876e0e

Browse files
committed
fix warnings
1 parent 42d5af5 commit d876e0e

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

agent/fw_drupal8.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -642,17 +642,14 @@ static bool nr_drupal_hook_attribute_instrument(zval* module_handler) {
642642
ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(hook_implementation_map), hook_key,
643643
hook_val) {
644644
if ((NULL == hook_key) || (0 == nr_php_is_zval_valid_array(hook_val))) {
645-
nrl_warning(NRL_FRAMEWORK,
646-
"hookImplementationsMap[hook = %s]: invalid value",
647-
NRSAFESTR(ZEND_STRING_VALUE(hook_key)));
645+
nrl_warning(NRL_FRAMEWORK, "hookImplementationsMap[hook]: invalid value");
648646
return false;
649647
}
650648

651649
ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(hook_val), class_key, class_val) {
652650
if ((NULL == class_key) || (0 == nr_php_is_zval_valid_array(class_val))) {
653651
nrl_warning(NRL_FRAMEWORK,
654-
"hookImplementationsMap[class = %s]: invalid value",
655-
NRSAFESTR(ZEND_STRING_VALUE(class_key)));
652+
"hookImplementationsMap[class]: invalid value");
656653
return false;
657654
}
658655

@@ -661,8 +658,7 @@ static bool nr_drupal_hook_attribute_instrument(zval* module_handler) {
661658
if ((NULL == method_key)
662659
|| (0 == nr_php_is_zval_valid_string(module_val))) {
663660
nrl_warning(NRL_FRAMEWORK,
664-
"hookImplementationsMap[method = %s]: invalid value",
665-
NRSAFESTR(ZEND_STRING_VALUE(method_key)));
661+
"hookImplementationsMap[method]: invalid value");
666662
return false;
667663
}
668664

0 commit comments

Comments
 (0)