Skip to content

Commit 95091bb

Browse files
committed
fix warnings
1 parent a942c20 commit 95091bb

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
@@ -645,17 +645,14 @@ static bool nr_drupal_hook_attribute_instrument(zval* module_handler) {
645645
ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(hook_implementation_map), hook_key,
646646
hook_val) {
647647
if ((NULL == hook_key) || (0 == nr_php_is_zval_valid_array(hook_val))) {
648-
nrl_warning(NRL_FRAMEWORK,
649-
"hookImplementationsMap[hook = %s]: invalid value",
650-
NRSAFESTR(ZEND_STRING_VALUE(hook_key)));
648+
nrl_warning(NRL_FRAMEWORK, "hookImplementationsMap[hook]: invalid value");
651649
return false;
652650
}
653651

654652
ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(hook_val), class_key, class_val) {
655653
if ((NULL == class_key) || (0 == nr_php_is_zval_valid_array(class_val))) {
656654
nrl_warning(NRL_FRAMEWORK,
657-
"hookImplementationsMap[class = %s]: invalid value",
658-
NRSAFESTR(ZEND_STRING_VALUE(class_key)));
655+
"hookImplementationsMap[class]: invalid value");
659656
return false;
660657
}
661658

@@ -664,8 +661,7 @@ static bool nr_drupal_hook_attribute_instrument(zval* module_handler) {
664661
if ((NULL == method_key)
665662
|| (0 == nr_php_is_zval_valid_string(module_val))) {
666663
nrl_warning(NRL_FRAMEWORK,
667-
"hookImplementationsMap[method = %s]: invalid value",
668-
NRSAFESTR(ZEND_STRING_VALUE(method_key)));
664+
"hookImplementationsMap[method]: invalid value");
669665
return false;
670666
}
671667

0 commit comments

Comments
 (0)