mirror of
https://github.com/php/php-src.git
synced 2024-11-23 01:44:06 +08:00
Merge branch 'PHP-8.4'
* PHP-8.4: Fix compiler warning in zend_test
This commit is contained in:
commit
06b99c059e
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user