[php-src] master: intl: replace U_CFUNC by static for some functions

Author: Gina Peter Banyard (Girgias) Date: 2026-10-23T19:10:20+01:00 Commit: https://github.com/php/php-src/commit/16375e4081f294f45e85d098850c2a5f6e21c13a Raw diff: https://github.com/php/php-src/commit/16375e4081f294f45e85d098850c2a5f6e21c13a.diff intl: replace U_CFUNC by static for some functions Changed paths: M ext/intl/formatter/formatter_class.cpp M ext/intl/msgformat/msgformat_class.cpp M ext/intl/resourcebundle/resourcebundle_class.cpp M ext/intl/spoofchecker/spoofchecker_class.cpp Diff: diff --git a/ext/intl/formatter/formatter_class.cpp b/ext/intl/formatter/formatter_class.cpp index bcdfbee63559..2f3a4bb27ee4 100644 --- a/ext/intl/formatter/formatter_class.cpp +++ b/ext/intl/formatter/formatter_class.cpp @@ -35,7 +35,7 @@ static zend_object_handlers NumberFormatter_handlers; */ /* {{{ NumberFormatter_objects_free */ -U_CFUNC void NumberFormatter_object_free( zend_object *object ) +static void NumberFormatter_object_free( zend_object *object ) { NumberFormatter_object* nfo = php_intl_number_format_fetch_object(object); @@ -46,7 +46,7 @@ U_CFUNC void NumberFormatter_object_free( zend_object *object ) /* }}} */ /* {{{ NumberFormatter_object_create */ -U_CFUNC zend_object *NumberFormatter_object_create(zend_class_entry *ce) +static zend_object *NumberFormatter_object_create(zend_class_entry *ce) { NumberFormatter_object* intern; @@ -61,7 +61,7 @@ U_CFUNC zend_object *NumberFormatter_object_create(zend_class_entry *ce) /* }}} */ /* {{{ NumberFormatter_object_clone */ -U_CFUNC zend_object *NumberFormatter_object_clone(zend_object *object) +static zend_object *NumberFormatter_object_clone(zend_object *object) { const NumberFormatter_object *nfo = php_intl_number_format_fetch_object(object); zend_object *new_obj = NumberFormatter_ce_ptr->create_object(object->ce); diff --git a/ext/intl/msgformat/msgformat_class.cpp b/ext/intl/msgformat/msgformat_class.cpp index 52f6c79df8cd..79398fb76e1d 100644 --- a/ext/intl/msgformat/msgformat_class.cpp +++ b/ext/intl/msgformat/msgformat_class.cpp @@ -31,7 +31,7 @@ static zend_object_handlers MessageFormatter_handlers; */ /* {{{ MessageFormatter_objects_free */ -U_CFUNC void MessageFormatter_object_free( zend_object *object ) +static void MessageFormatter_object_free( zend_object *object ) { MessageFormatter_object* mfo = php_intl_messageformatter_fetch_object(object); @@ -42,7 +42,7 @@ U_CFUNC void MessageFormatter_object_free( zend_object *object ) /* }}} */ /* {{{ MessageFormatter_object_create */ -U_CFUNC zend_object *MessageFormatter_object_create(zend_class_entry *ce) +static zend_object *MessageFormatter_object_create(zend_class_entry *ce) { MessageFormatter_object* intern; @@ -56,7 +56,7 @@ U_CFUNC zend_object *MessageFormatter_object_create(zend_class_entry *ce) /* }}} */ /* {{{ MessageFormatter_object_clone */ -U_CFUNC zend_object *MessageFormatter_object_clone(zend_object *object) +static zend_object *MessageFormatter_object_clone(zend_object *object) { const MessageFormatter_object *mfo = php_intl_messageformatter_fetch_object(object); zend_object *new_obj = MessageFormatter_ce_ptr->create_object(object->ce); diff --git a/ext/intl/resourcebundle/resourcebundle_class.cpp b/ext/intl/resourcebundle/resourcebundle_class.cpp index e5a0fe1eefc7..a7ca5eceeaa4 100644 --- a/ext/intl/resourcebundle/resourcebundle_class.cpp +++ b/ext/intl/resourcebundle/resourcebundle_class.cpp @@ -239,7 +239,7 @@ static zval *resource_bundle_array_fetch( /* }}} */ /* {{{ resourcebundle_array_get */ -U_CFUNC zval *resourcebundle_array_get(zend_object *object, zval *offset, int type, zval *rv) +static zval *resourcebundle_array_get(zend_object *object, zval *offset, int type, zval *rv) { if (offset == NULL) { zend_throw_error(NULL, "Cannot apply [] to ResourceBundle object"); diff --git a/ext/intl/spoofchecker/spoofchecker_class.cpp b/ext/intl/spoofchecker/spoofchecker_class.cpp index 8cd9c35cfd2f..e118d09e300e 100644 --- a/ext/intl/spoofchecker/spoofchecker_class.cpp +++ b/ext/intl/spoofchecker/spoofchecker_class.cpp @@ -28,8 +28,7 @@ static zend_object_handlers Spoofchecker_handlers; * Auxiliary functions needed by objects of 'Spoofchecker' class */ -/* {{{ Spoofchecker_objects_free */ -U_CFUNC void Spoofchecker_objects_free(zend_object *object) +static void Spoofchecker_objects_free(zend_object *object) { Spoofchecker_object* co = php_intl_spoofchecker_fetch_object(object); @@ -37,10 +36,8 @@ U_CFUNC void Spoofchecker_objects_free(zend_object *object) spoofchecker_object_destroy(co); } -/* }}} */ -/* {{{ Spoofchecker_object_create */ -U_CFUNC zend_object *Spoofchecker_object_create(zend_class_entry *ce) +static zend_object *Spoofchecker_object_create(zend_class_entry *ce) { Spoofchecker_object* intern;