diff options
Diffstat (limited to 'ext/intl/spoofchecker/spoofchecker_class.c')
| -rw-r--r-- | ext/intl/spoofchecker/spoofchecker_class.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/ext/intl/spoofchecker/spoofchecker_class.c b/ext/intl/spoofchecker/spoofchecker_class.c index 5fb6ffb90c..84549ced83 100644 --- a/ext/intl/spoofchecker/spoofchecker_class.c +++ b/ext/intl/spoofchecker/spoofchecker_class.c @@ -30,32 +30,32 @@ static zend_object_handlers Spoofchecker_handlers; */ /* {{{ Spoofchecker_objects_dtor */ -static void Spoofchecker_objects_dtor(zend_object *object TSRMLS_DC) +static void Spoofchecker_objects_dtor(zend_object *object) { - zend_objects_destroy_object(object TSRMLS_CC); + zend_objects_destroy_object(object); } /* }}} */ /* {{{ Spoofchecker_objects_free */ -void Spoofchecker_objects_free(zend_object *object TSRMLS_DC) +void Spoofchecker_objects_free(zend_object *object) { Spoofchecker_object* co = php_intl_spoofchecker_fetch_object(object); - zend_object_std_dtor(&co->zo TSRMLS_CC); + zend_object_std_dtor(&co->zo); - spoofchecker_object_destroy(co TSRMLS_CC); + spoofchecker_object_destroy(co); } /* }}} */ /* {{{ Spoofchecker_object_create */ zend_object *Spoofchecker_object_create( - zend_class_entry *ce TSRMLS_DC) + zend_class_entry *ce) { Spoofchecker_object* intern; intern = ecalloc(1, sizeof(Spoofchecker_object) + sizeof(zval) * (ce->default_properties_count - 1)); - intl_error_init(SPOOFCHECKER_ERROR_P(intern) TSRMLS_CC); - zend_object_std_init(&intern->zo, ce TSRMLS_CC); + intl_error_init(SPOOFCHECKER_ERROR_P(intern)); + zend_object_std_init(&intern->zo, ce); object_properties_init(&intern->zo, ce); intern->zo.handlers = &Spoofchecker_handlers; @@ -107,24 +107,24 @@ zend_function_entry Spoofchecker_class_functions[] = { }; /* }}} */ -static zend_object *spoofchecker_clone_obj(zval *object TSRMLS_DC) /* {{{ */ +static zend_object *spoofchecker_clone_obj(zval *object) /* {{{ */ { zend_object *new_obj_val; Spoofchecker_object *sfo, *new_sfo; sfo = Z_INTL_SPOOFCHECKER_P(object); - intl_error_reset(SPOOFCHECKER_ERROR_P(sfo) TSRMLS_CC); + intl_error_reset(SPOOFCHECKER_ERROR_P(sfo)); - new_obj_val = Spoofchecker_ce_ptr->create_object(Z_OBJCE_P(object) TSRMLS_CC); + new_obj_val = Spoofchecker_ce_ptr->create_object(Z_OBJCE_P(object)); new_sfo = php_intl_spoofchecker_fetch_object(new_obj_val); /* clone standard parts */ - zend_objects_clone_members(&new_sfo->zo, &sfo->zo TSRMLS_CC); + zend_objects_clone_members(&new_sfo->zo, &sfo->zo); /* clone internal object */ new_sfo->uspoof = uspoof_clone(sfo->uspoof, SPOOFCHECKER_ERROR_CODE_P(new_sfo)); 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 TSRMLS_CC ); - Spoofchecker_objects_dtor(&new_sfo->zo TSRMLS_CC); /* free new object */ + intl_error_set( NULL, SPOOFCHECKER_ERROR_CODE(new_sfo), "Failed to clone SpoofChecker object", 0 ); + Spoofchecker_objects_dtor(&new_sfo->zo); /* free new object */ zend_error(E_ERROR, "Failed to clone SpoofChecker object"); } return new_obj_val; @@ -134,14 +134,14 @@ static zend_object *spoofchecker_clone_obj(zval *object TSRMLS_DC) /* {{{ */ /* {{{ spoofchecker_register_Spoofchecker_class * Initialize 'Spoofchecker' class */ -void spoofchecker_register_Spoofchecker_class(TSRMLS_D) +void spoofchecker_register_Spoofchecker_class(void) { zend_class_entry ce; /* Create and register 'Spoofchecker' class. */ INIT_CLASS_ENTRY(ce, "Spoofchecker", Spoofchecker_class_functions); ce.create_object = Spoofchecker_object_create; - Spoofchecker_ce_ptr = zend_register_internal_class(&ce TSRMLS_CC); + Spoofchecker_ce_ptr = zend_register_internal_class(&ce); memcpy(&Spoofchecker_handlers, zend_get_std_object_handlers(), sizeof Spoofchecker_handlers); @@ -163,20 +163,20 @@ void spoofchecker_register_Spoofchecker_class(TSRMLS_D) * Initialize internals of Spoofchecker_object. * Must be called before any other call to 'spoofchecker_object_...' functions. */ -void spoofchecker_object_init(Spoofchecker_object* co TSRMLS_DC) +void spoofchecker_object_init(Spoofchecker_object* co) { if (!co) { return; } - intl_error_init(SPOOFCHECKER_ERROR_P(co) TSRMLS_CC); + intl_error_init(SPOOFCHECKER_ERROR_P(co)); } /* }}} */ /* {{{ void spoofchecker_object_destroy( Spoofchecker_object* co ) * Clean up mem allocted by internals of Spoofchecker_object */ -void spoofchecker_object_destroy(Spoofchecker_object* co TSRMLS_DC) +void spoofchecker_object_destroy(Spoofchecker_object* co) { if (!co) { return; @@ -187,7 +187,7 @@ void spoofchecker_object_destroy(Spoofchecker_object* co TSRMLS_DC) co->uspoof = NULL; } - intl_error_reset(SPOOFCHECKER_ERROR_P(co) TSRMLS_CC); + intl_error_reset(SPOOFCHECKER_ERROR_P(co)); } /* }}} */ |