[php-src] master: intl: make spoofchecker_object_destroy() private

Author: Gina Peter Banyard (Girgias) Date: 2026-10-23T19:10:20+01:00 Commit: https://github.com/php/php-src/commit/18853171a4c3a7a1132d2fa91aff712be10ed7bb Raw diff: https://github.com/php/php-src/commit/18853171a4c3a7a1132d2fa91aff712be10ed7bb.diff intl: make spoofchecker_object_destroy() private Changed paths: M ext/intl/spoofchecker/spoofchecker_class.cpp M ext/intl/spoofchecker/spoofchecker_class.h Diff: diff --git a/ext/intl/spoofchecker/spoofchecker_class.cpp b/ext/intl/spoofchecker/spoofchecker_class.cpp index e118d09e300e..fcadb2f44808 100644 --- a/ext/intl/spoofchecker/spoofchecker_class.cpp +++ b/ext/intl/spoofchecker/spoofchecker_class.cpp @@ -28,6 +28,24 @@ static zend_object_handlers Spoofchecker_handlers; * Auxiliary functions needed by objects of 'Spoofchecker' class */ +/* Clean up mem allocted by internals of Spoofchecker_object */ +static void spoofchecker_object_destroy(Spoofchecker_object* co) +{ + if (!co) { + return; + } + + if (co->uspoof) { + uspoof_close(co->uspoof); + co->uspoof = NULL; + } + + intl_icu_compat_uspoof_close_check_result(co->uspoofres); + co->uspoofres = NULL; + + intl_error_reset(SPOOFCHECKER_ERROR_P(co)); +} + static void Spoofchecker_objects_free(zend_object *object) { Spoofchecker_object* co = php_intl_spoofchecker_fetch_object(object); @@ -100,24 +118,3 @@ U_CFUNC void spoofchecker_register_Spoofchecker_class(void) Spoofchecker_handlers.free_obj = Spoofchecker_objects_free; } /* }}} */ - -/* {{{ void spoofchecker_object_destroy( Spoofchecker_object* co ) - * Clean up mem allocted by internals of Spoofchecker_object - */ -U_CFUNC void spoofchecker_object_destroy(Spoofchecker_object* co) -{ - if (!co) { - return; - } - - if (co->uspoof) { - uspoof_close(co->uspoof); - co->uspoof = NULL; - } - - intl_icu_compat_uspoof_close_check_result(co->uspoofres); - co->uspoofres = NULL; - - intl_error_reset(SPOOFCHECKER_ERROR_P(co)); -} -/* }}} */ diff --git a/ext/intl/spoofchecker/spoofchecker_class.h b/ext/intl/spoofchecker/spoofchecker_class.h index 347b78e3ffd4..dc9aa43db8a6 100644 --- a/ext/intl/spoofchecker/spoofchecker_class.h +++ b/ext/intl/spoofchecker/spoofchecker_class.h @@ -54,8 +54,6 @@ typedef struct { extern "C" { #endif void spoofchecker_register_Spoofchecker_class(void); - -void spoofchecker_object_destroy(Spoofchecker_object* co); #ifdef __cplusplus } #endif