summaryrefslogtreecommitdiff
path: root/ext/intl/breakiterator/breakiterator_class.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ext/intl/breakiterator/breakiterator_class.cpp')
-rw-r--r--ext/intl/breakiterator/breakiterator_class.cpp62
1 files changed, 31 insertions, 31 deletions
diff --git a/ext/intl/breakiterator/breakiterator_class.cpp b/ext/intl/breakiterator/breakiterator_class.cpp
index 715a866111..813204cd21 100644
--- a/ext/intl/breakiterator/breakiterator_class.cpp
+++ b/ext/intl/breakiterator/breakiterator_class.cpp
@@ -47,7 +47,7 @@ zend_object_handlers BreakIterator_handlers;
/* }}} */
U_CFUNC void breakiterator_object_create(zval *object,
- BreakIterator *biter, int brand_new TSRMLS_DC)
+ BreakIterator *biter, int brand_new)
{
UClassID classId = biter->getDynamicClassID();
zend_class_entry *ce;
@@ -63,11 +63,11 @@ U_CFUNC void breakiterator_object_create(zval *object,
if (brand_new) {
object_init_ex(object, ce);
}
- breakiterator_object_construct(object, biter TSRMLS_CC);
+ breakiterator_object_construct(object, biter);
}
U_CFUNC void breakiterator_object_construct(zval *object,
- BreakIterator *biter TSRMLS_DC)
+ BreakIterator *biter)
{
BreakIterator_object *bio;
@@ -78,7 +78,7 @@ U_CFUNC void breakiterator_object_construct(zval *object,
/* {{{ compare handler for BreakIterator */
static int BreakIterator_compare_objects(zval *object1,
- zval *object2 TSRMLS_DC)
+ zval *object2)
{
BreakIterator_object *bio1,
*bio2;
@@ -95,19 +95,19 @@ static int BreakIterator_compare_objects(zval *object1,
/* }}} */
/* {{{ clone handler for BreakIterator */
-static zend_object *BreakIterator_clone_obj(zval *object TSRMLS_DC)
+static zend_object *BreakIterator_clone_obj(zval *object)
{
BreakIterator_object *bio_orig,
*bio_new;
zend_object *ret_val;
bio_orig = Z_INTL_BREAKITERATOR_P(object);
- intl_errors_reset(INTL_DATA_ERROR_P(bio_orig) TSRMLS_CC);
+ intl_errors_reset(INTL_DATA_ERROR_P(bio_orig));
- ret_val = BreakIterator_ce_ptr->create_object(Z_OBJCE_P(object) TSRMLS_CC);
+ ret_val = BreakIterator_ce_ptr->create_object(Z_OBJCE_P(object));
bio_new = php_intl_breakiterator_fetch_object(ret_val);
- zend_objects_clone_members(&bio_new->zo, &bio_orig->zo TSRMLS_CC);
+ zend_objects_clone_members(&bio_new->zo, &bio_orig->zo);
if (bio_orig->biter != NULL) {
BreakIterator *new_biter;
@@ -116,18 +116,18 @@ static zend_object *BreakIterator_clone_obj(zval *object TSRMLS_DC)
if (!new_biter) {
zend_string *err_msg;
intl_errors_set_code(BREAKITER_ERROR_P(bio_orig),
- U_MEMORY_ALLOCATION_ERROR TSRMLS_CC);
+ U_MEMORY_ALLOCATION_ERROR);
intl_errors_set_custom_msg(BREAKITER_ERROR_P(bio_orig),
- "Could not clone BreakIterator", 0 TSRMLS_CC);
- err_msg = intl_error_get_message(BREAKITER_ERROR_P(bio_orig) TSRMLS_CC);
- zend_throw_exception(NULL, err_msg->val, 0 TSRMLS_CC);
+ "Could not clone BreakIterator", 0);
+ err_msg = intl_error_get_message(BREAKITER_ERROR_P(bio_orig));
+ zend_throw_exception(NULL, err_msg->val, 0);
zend_string_free(err_msg);
} else {
bio_new->biter = new_biter;
ZVAL_COPY(&bio_new->text, &bio_orig->text);
}
} else {
- zend_throw_exception(NULL, "Cannot clone unconstructed BreakIterator", 0 TSRMLS_CC);
+ zend_throw_exception(NULL, "Cannot clone unconstructed BreakIterator", 0);
}
return ret_val;
@@ -135,7 +135,7 @@ static zend_object *BreakIterator_clone_obj(zval *object TSRMLS_DC)
/* }}} */
/* {{{ get_debug_info handler for BreakIterator */
-static HashTable *BreakIterator_get_debug_info(zval *object, int *is_temp TSRMLS_DC)
+static HashTable *BreakIterator_get_debug_info(zval *object, int *is_temp)
{
zval val;
HashTable *debug_info;
@@ -176,23 +176,23 @@ static HashTable *BreakIterator_get_debug_info(zval *object, int *is_temp TSRMLS
/* {{{ void breakiterator_object_init(BreakIterator_object* to)
* Initialize internals of BreakIterator_object not specific to zend standard objects.
*/
-static void breakiterator_object_init(BreakIterator_object *bio TSRMLS_DC)
+static void breakiterator_object_init(BreakIterator_object *bio)
{
- intl_error_init(BREAKITER_ERROR_P(bio) TSRMLS_CC);
+ intl_error_init(BREAKITER_ERROR_P(bio));
bio->biter = NULL;
ZVAL_UNDEF(&bio->text);
}
/* }}} */
/* {{{ BreakIterator_objects_dtor */
-static void BreakIterator_objects_dtor(zend_object *object TSRMLS_DC)
+static void BreakIterator_objects_dtor(zend_object *object)
{
- zend_objects_destroy_object(object TSRMLS_CC);
+ zend_objects_destroy_object(object);
}
/* }}} */
/* {{{ BreakIterator_objects_free */
-static void BreakIterator_objects_free(zend_object *object TSRMLS_DC)
+static void BreakIterator_objects_free(zend_object *object)
{
BreakIterator_object* bio = php_intl_breakiterator_fetch_object(object);
@@ -201,22 +201,22 @@ static void BreakIterator_objects_free(zend_object *object TSRMLS_DC)
delete bio->biter;
bio->biter = NULL;
}
- intl_error_reset(BREAKITER_ERROR_P(bio) TSRMLS_CC);
+ intl_error_reset(BREAKITER_ERROR_P(bio));
- zend_object_std_dtor(&bio->zo TSRMLS_CC);
+ zend_object_std_dtor(&bio->zo);
}
/* }}} */
/* {{{ BreakIterator_object_create */
-static zend_object *BreakIterator_object_create(zend_class_entry *ce TSRMLS_DC)
+static zend_object *BreakIterator_object_create(zend_class_entry *ce)
{
BreakIterator_object* intern;
intern = (BreakIterator_object*)ecalloc(1, sizeof(BreakIterator_object) + sizeof(zval) * (ce->default_properties_count - 1));
- zend_object_std_init(&intern->zo, ce TSRMLS_CC);
+ zend_object_std_init(&intern->zo, ce);
object_properties_init((zend_object*) intern, ce);
- breakiterator_object_init(intern TSRMLS_CC);
+ breakiterator_object_init(intern);
intern->zo.handlers = &BreakIterator_handlers;
@@ -316,7 +316,7 @@ static const zend_function_entry CodePointBreakIterator_class_functions[] = {
/* {{{ breakiterator_register_BreakIterator_class
* Initialize 'BreakIterator' class
*/
-U_CFUNC void breakiterator_register_BreakIterator_class(TSRMLS_D)
+U_CFUNC void breakiterator_register_BreakIterator_class(void)
{
zend_class_entry ce;
@@ -324,7 +324,7 @@ U_CFUNC void breakiterator_register_BreakIterator_class(TSRMLS_D)
INIT_CLASS_ENTRY(ce, "IntlBreakIterator", BreakIterator_class_functions);
ce.create_object = BreakIterator_object_create;
ce.get_iterator = _breakiterator_get_iterator;
- BreakIterator_ce_ptr = zend_register_internal_class(&ce TSRMLS_CC);
+ BreakIterator_ce_ptr = zend_register_internal_class(&ce);
memcpy(&BreakIterator_handlers, zend_get_std_object_handlers(),
sizeof BreakIterator_handlers);
@@ -335,16 +335,16 @@ U_CFUNC void breakiterator_register_BreakIterator_class(TSRMLS_D)
BreakIterator_handlers.dtor_obj = BreakIterator_objects_dtor;
BreakIterator_handlers.free_obj = BreakIterator_objects_free;
- zend_class_implements(BreakIterator_ce_ptr TSRMLS_CC, 1,
+ zend_class_implements(BreakIterator_ce_ptr, 1,
zend_ce_traversable);
zend_declare_class_constant_long(BreakIterator_ce_ptr,
- "DONE", sizeof("DONE") - 1, BreakIterator::DONE TSRMLS_CC );
+ "DONE", sizeof("DONE") - 1, BreakIterator::DONE );
/* Declare constants that are defined in the C header */
#define BREAKITER_DECL_LONG_CONST(name) \
zend_declare_class_constant_long(BreakIterator_ce_ptr, #name, \
- sizeof(#name) - 1, UBRK_ ## name TSRMLS_CC)
+ sizeof(#name) - 1, UBRK_ ## name)
BREAKITER_DECL_LONG_CONST(WORD_NONE);
BREAKITER_DECL_LONG_CONST(WORD_NONE_LIMIT);
@@ -374,12 +374,12 @@ U_CFUNC void breakiterator_register_BreakIterator_class(TSRMLS_D)
INIT_CLASS_ENTRY(ce, "IntlRuleBasedBreakIterator",
RuleBasedBreakIterator_class_functions);
RuleBasedBreakIterator_ce_ptr = zend_register_internal_class_ex(&ce,
- BreakIterator_ce_ptr TSRMLS_CC);
+ BreakIterator_ce_ptr);
/* Create and register 'CodePointBreakIterator' class. */
INIT_CLASS_ENTRY(ce, "IntlCodePointBreakIterator",
CodePointBreakIterator_class_functions);
CodePointBreakIterator_ce_ptr = zend_register_internal_class_ex(&ce,
- BreakIterator_ce_ptr TSRMLS_CC);
+ BreakIterator_ce_ptr);
}
/* }}} */
View Lorry Controller Status