Skip to content

Commit cdbf3fd

Browse files
committed
Remove redundant dtor_obj handlers in intl
Both of these just forward to the default implementation, so just use that directly. This is simpler and benefits from the special-casing of the default implementation.
1 parent cde735e commit cdbf3fd

File tree

2 files changed

+0
-16
lines changed

2 files changed

+0
-16
lines changed

ext/intl/dateformat/dateformat_class.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,6 @@ static zend_object_handlers IntlDateFormatter_handlers;
2828
* Auxiliary functions needed by objects of 'IntlDateFormatter' class
2929
*/
3030

31-
/* {{{ IntlDateFormatter_objects_dtor */
32-
static void IntlDateFormatter_object_dtor(zend_object *object )
33-
{
34-
zend_objects_destroy_object( object );
35-
}
36-
/* }}} */
37-
3831
/* {{{ IntlDateFormatter_objects_free */
3932
void IntlDateFormatter_object_free( zend_object *object )
4033
{
@@ -116,7 +109,6 @@ void dateformat_register_IntlDateFormatter_class( void )
116109
sizeof IntlDateFormatter_handlers);
117110
IntlDateFormatter_handlers.offset = XtOffsetOf(IntlDateFormatter_object, zo);
118111
IntlDateFormatter_handlers.clone_obj = IntlDateFormatter_object_clone;
119-
IntlDateFormatter_handlers.dtor_obj = IntlDateFormatter_object_dtor;
120112
IntlDateFormatter_handlers.free_obj = IntlDateFormatter_object_free;
121113
}
122114
/* }}} */

ext/intl/timezone/timezone_class.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -352,13 +352,6 @@ static void TimeZone_object_init(TimeZone_object *to)
352352
}
353353
/* }}} */
354354

355-
/* {{{ TimeZone_objects_dtor */
356-
static void TimeZone_objects_dtor(zend_object *object)
357-
{
358-
zend_objects_destroy_object(object);
359-
}
360-
/* }}} */
361-
362355
/* {{{ TimeZone_objects_free */
363356
static void TimeZone_objects_free(zend_object *object)
364357
{
@@ -406,7 +399,6 @@ U_CFUNC void timezone_register_IntlTimeZone_class(void)
406399
TimeZone_handlers.clone_obj = TimeZone_clone_obj;
407400
TimeZone_handlers.compare = TimeZone_compare_objects;
408401
TimeZone_handlers.get_debug_info = TimeZone_get_debug_info;
409-
TimeZone_handlers.dtor_obj = TimeZone_objects_dtor;
410402
TimeZone_handlers.free_obj = TimeZone_objects_free;
411403

412404

0 commit comments

Comments
 (0)