From 8d30ed4f808da939f2fd648fcab6307921c787ad Mon Sep 17 00:00:00 2001 From: Arnaud Le Blanc Date: Wed, 30 Oct 2024 12:20:00 +0100 Subject: [PATCH] Fix compiler warning in zend_test Closes GH-16650 --- ext/zend_test/observer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/zend_test/observer.c b/ext/zend_test/observer.c index cb3ca5da229..d2a91d16840 100644 --- a/ext/zend_test/observer.c +++ b/ext/zend_test/observer.c @@ -315,7 +315,7 @@ static ZEND_INI_MH(zend_test_observer_OnUpdateCommaList) } if (stage != PHP_INI_STAGE_STARTUP && stage != PHP_INI_STAGE_ACTIVATE && stage != PHP_INI_STAGE_DEACTIVATE && stage != PHP_INI_STAGE_SHUTDOWN) { ZEND_HASH_FOREACH_STR_KEY(*p, funcname) { - if ((func = zend_hash_find_ptr(EG(function_table), funcname)) && ZEND_OBSERVER_DATA(func) != NULL) { + if ((func = zend_hash_find_ptr(EG(function_table), funcname))) { void *old_handler; zend_observer_remove_begin_handler(func, observer_begin, (zend_observer_fcall_begin_handler *)&old_handler); zend_observer_remove_end_handler(func, observer_end, (zend_observer_fcall_end_handler *)&old_handler); @@ -338,7 +338,7 @@ static ZEND_INI_MH(zend_test_observer_OnUpdateCommaList) zend_string_release(str); if (stage != PHP_INI_STAGE_STARTUP && stage != PHP_INI_STAGE_ACTIVATE && stage != PHP_INI_STAGE_DEACTIVATE && stage != PHP_INI_STAGE_SHUTDOWN) { ZEND_HASH_FOREACH_STR_KEY(*p, funcname) { - if ((func = zend_hash_find_ptr(EG(function_table), funcname)) && ZEND_OBSERVER_DATA(func) != NULL) { + if ((func = zend_hash_find_ptr(EG(function_table), funcname))) { zend_observer_add_begin_handler(func, observer_begin); zend_observer_add_end_handler(func, observer_end); }