com php-src: Remove useless dtor handlers in intl: ext/intl/bre akiterator/breakiterator_class.cpp ext/intl/calendar/cale ndar_class.cpp
ext/intl/collator/collator_class.c e xt/intl/formatter/formatter_class.c ext/intl/msgformat/ms gformat_class.c ext/intl/spoofchecker/spoofchecker_clas
s.c ext/intl/transliterator/transliterator_class.c

Commit: 29af302395923de0a701d61172051d3b637744c8 Author: Nikita Popov <nikic@php.net> Fri, 15 Jul 2016 23:09:18 +0200 Parents: cbba1fff3f81bb7c4e6455d2170563e42cca559d Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=29af302395923de0a701d61172051d3b637744c8 Log: Remove useless dtor handlers in intl These are only indirections to the default handler Changed paths: M ext/intl/breakiterator/breakiterator_class.cpp M ext/intl/calendar/calendar_class.cpp M ext/intl/collator/collator_class.c M ext/intl/formatter/formatter_class.c M ext/intl/msgformat/msgformat_class.c M ext/intl/spoofchecker/spoofchecker_class.c M ext/intl/transliterator/transliterator_class.c Diff: diff --git a/ext/intl/breakiterator/breakiterator_class.cpp b/ext/intl/breakiterator/breakiterator_class..cpp index db99ad0..ae9e258 100644 --- a/ext/intl/breakiterator/breakiterator_class.cpp +++ b/ext/intl/breakiterator/breakiterator_class.cpp @@ -184,13 +184,6 @@ static void breakiterator_object_init(BreakIterator_object *bio) } /* }}} */ -/* {{{ BreakIterator_objects_dtor */ -static void BreakIterator_objects_dtor(zend_object *object) -{ - zend_objects_destroy_object(object); -} -/* }}} */ - /* {{{ BreakIterator_objects_free */ static void BreakIterator_objects_free(zend_object *object) { @@ -332,7 +325,6 @@ U_CFUNC void breakiterator_register_BreakIterator_class(void) BreakIterator_handlers.compare_objects = BreakIterator_compare_objects; BreakIterator_handlers.clone_obj = BreakIterator_clone_obj; BreakIterator_handlers.get_debug_info = BreakIterator_get_debug_info; - BreakIterator_handlers.dtor_obj = BreakIterator_objects_dtor; BreakIterator_handlers.free_obj = BreakIterator_objects_free; zend_class_implements(BreakIterator_ce_ptr, 1, diff --git a/ext/intl/calendar/calendar_class.cpp b/ext/intl/calendar/calendar_class.cpp index 574f9a0..d8a9995 100644 --- a/ext/intl/calendar/calendar_class.cpp +++ b/ext/intl/calendar/calendar_class.cpp @@ -231,13 +231,6 @@ static void calendar_object_init(Calendar_object *co) } /* }}} */ -/* {{{ Calendar_objects_dtor */ -static void Calendar_objects_dtor(zend_object *object) -{ - zend_objects_destroy_object(object); -} -/* }}} */ - /* {{{ Calendar_objects_free */ static void Calendar_objects_free(zend_object *object) { @@ -474,7 +467,6 @@ void calendar_register_IntlCalendar_class(void) Calendar_handlers.offset = XtOffsetOf(Calendar_object, zo); Calendar_handlers.clone_obj = Calendar_clone_obj; Calendar_handlers.get_debug_info = Calendar_get_debug_info; - Calendar_handlers.dtor_obj = Calendar_objects_dtor; Calendar_handlers.free_obj = Calendar_objects_free; /* Create and register 'IntlGregorianCalendar' class. */ diff --git a/ext/intl/collator/collator_class.c b/ext/intl/collator/collator_class.c index 4fc7067..11aaea5 100644 --- a/ext/intl/collator/collator_class.c +++ b/ext/intl/collator/collator_class.c @@ -35,13 +35,6 @@ static zend_object_handlers Collator_handlers; * Auxiliary functions needed by objects of 'Collator' class */ -/* {{{ Collator_objects_dtor */ -static void Collator_objects_dtor(zend_object *object ) -{ - zend_objects_destroy_object(object ); -} -/* }}} */ - /* {{{ Collator_objects_free */ void Collator_objects_free(zend_object *object ) { @@ -138,7 +131,6 @@ void collator_register_Collator_class( void ) for which we don't have the place to keep */ Collator_handlers.offset = XtOffsetOf(Collator_object, zo); Collator_handlers.clone_obj = NULL; - Collator_handlers.dtor_obj = Collator_objects_dtor; Collator_handlers.free_obj = Collator_objects_free; /* Declare 'Collator' class properties. */ diff --git a/ext/intl/formatter/formatter_class.c b/ext/intl/formatter/formatter_class.c index 287d19a..bf4387b 100644 --- a/ext/intl/formatter/formatter_class.c +++ b/ext/intl/formatter/formatter_class.c @@ -33,13 +33,6 @@ static zend_object_handlers NumberFormatter_handlers; * Auxiliary functions needed by objects of 'NumberFormatter' class */ -/* {{{ NumberFormatter_objects_dtor */ -static void NumberFormatter_object_dtor(zend_object *object) -{ - zend_objects_destroy_object( object ); -} -/* }}} */ - /* {{{ NumberFormatter_objects_free */ void NumberFormatter_object_free( zend_object *object ) { @@ -195,7 +188,6 @@ void formatter_register_class( void ) sizeof(NumberFormatter_handlers)); NumberFormatter_handlers.offset = XtOffsetOf(NumberFormatter_object, zo); NumberFormatter_handlers.clone_obj = NumberFormatter_object_clone; - NumberFormatter_handlers.dtor_obj = NumberFormatter_object_dtor; NumberFormatter_handlers.free_obj = NumberFormatter_object_free; /* Declare 'NumberFormatter' class properties. */ diff --git a/ext/intl/msgformat/msgformat_class.c b/ext/intl/msgformat/msgformat_class.c index 8d464c6..90dac81 100644 --- a/ext/intl/msgformat/msgformat_class.c +++ b/ext/intl/msgformat/msgformat_class.c @@ -33,13 +33,6 @@ static zend_object_handlers MessageFormatter_handlers; * Auxiliary functions needed by objects of 'MessageFormatter' class */ -/* {{{ MessageFormatter_objects_dtor */ -static void MessageFormatter_object_dtor(zend_object *object ) -{ - zend_objects_destroy_object( object ); -} -/* }}} */ - /* {{{ MessageFormatter_objects_free */ void MessageFormatter_object_free( zend_object *object ) { @@ -163,7 +156,6 @@ void msgformat_register_class( void ) sizeof MessageFormatter_handlers); MessageFormatter_handlers.offset = XtOffsetOf(MessageFormatter_object, zo); MessageFormatter_handlers.clone_obj = MessageFormatter_object_clone; - MessageFormatter_handlers.dtor_obj = MessageFormatter_object_dtor; MessageFormatter_handlers.free_obj = MessageFormatter_object_free; diff --git a/ext/intl/spoofchecker/spoofchecker_class.c b/ext/intl/spoofchecker/spoofchecker_class.c index d93c709..5cfc27d 100644 --- a/ext/intl/spoofchecker/spoofchecker_class.c +++ b/ext/intl/spoofchecker/spoofchecker_class.c @@ -29,13 +29,6 @@ static zend_object_handlers Spoofchecker_handlers; * Auxiliary functions needed by objects of 'Spoofchecker' class */ -/* {{{ Spoofchecker_objects_dtor */ -static void Spoofchecker_objects_dtor(zend_object *object) -{ - zend_objects_destroy_object(object); -} -/* }}} */ - /* {{{ Spoofchecker_objects_free */ void Spoofchecker_objects_free(zend_object *object) { @@ -124,7 +117,7 @@ static zend_object *spoofchecker_clone_obj(zval *object) /* {{{ */ if(U_FAILURE(SPOOFCHECKER_ERROR_CODE(new_sfo))) { /* set up error in case error handler is interested */ intl_error_set( NULL, SPOOFCHECKER_ERROR_CODE(new_sfo), "Failed to clone SpoofChecker object", 0 ); - Spoofchecker_objects_dtor(&new_sfo->zo); /* free new object */ + Spoofchecker_objects_free(&new_sfo->zo); /* free new object */ zend_error(E_ERROR, "Failed to clone SpoofChecker object"); } return new_obj_val; @@ -147,7 +140,6 @@ void spoofchecker_register_Spoofchecker_class(void) sizeof Spoofchecker_handlers); Spoofchecker_handlers.offset = XtOffsetOf(Spoofchecker_object, zo); Spoofchecker_handlers.clone_obj = spoofchecker_clone_obj; - Spoofchecker_handlers.dtor_obj = Spoofchecker_objects_dtor; Spoofchecker_handlers.free_obj = Spoofchecker_objects_free; if (!Spoofchecker_ce_ptr) { diff --git a/ext/intl/transliterator/transliterator_class.c b/ext/intl/transliterator/transliterator_class.c index beeee41..4325a45 100644 --- a/ext/intl/transliterator/transliterator_class.c +++ b/ext/intl/transliterator/transliterator_class.c @@ -97,14 +97,6 @@ static void transliterator_object_destroy( Transliterator_object* to ) } /* }}} */ -/* {{{ Transliterator_objects_dtor */ -static void Transliterator_objects_dtor( - zend_object *object ) -{ - zend_objects_destroy_object( object ); -} -/* }}} */ - /* {{{ Transliterator_objects_free */ static void Transliterator_objects_free( zend_object *object ) { @@ -348,7 +340,6 @@ void transliterator_register_Transliterator_class( void ) memcpy( &Transliterator_handlers, zend_get_std_object_handlers(), sizeof Transliterator_handlers ); Transliterator_handlers.offset = XtOffsetOf(Transliterator_object, zo); - Transliterator_handlers.dtor_obj = Transliterator_objects_dtor; Transliterator_handlers.free_obj = Transliterator_objects_free; Transliterator_handlers.clone_obj = Transliterator_clone_obj; Transliterator_handlers.get_property_ptr_ptr = Transliterator_get_property_ptr_ptr;