summaryrefslogtreecommitdiff
path: root/ext/intl/normalizer/normalizer_normalize.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/intl/normalizer/normalizer_normalize.c')
-rw-r--r--ext/intl/normalizer/normalizer_normalize.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/ext/intl/normalizer/normalizer_normalize.c b/ext/intl/normalizer/normalizer_normalize.c
index d3ac07024b..97163a98c4 100644
--- a/ext/intl/normalizer/normalizer_normalize.c
+++ b/ext/intl/normalizer/normalizer_normalize.c
@@ -50,14 +50,14 @@ PHP_FUNCTION( normalizer_normalize )
int32_t size_needed;
- intl_error_reset( NULL TSRMLS_CC );
+ intl_error_reset( NULL );
/* Parse parameters. */
- if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "s|l",
+ if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "s|l",
&input, &input_len, &form ) == FAILURE )
{
intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
- "normalizer_normalize: unable to parse input params", 0 TSRMLS_CC );
+ "normalizer_normalize: unable to parse input params", 0 );
RETURN_FALSE;
}
@@ -78,7 +78,7 @@ PHP_FUNCTION( normalizer_normalize )
break;
default:
intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
- "normalizer_normalize: illegal normalization form", 0 TSRMLS_CC );
+ "normalizer_normalize: illegal normalization form", 0 );
RETURN_FALSE;
}
@@ -92,10 +92,10 @@ PHP_FUNCTION( normalizer_normalize )
if( U_FAILURE( status ) )
{
/* Set global error code. */
- intl_error_set_code( NULL, status TSRMLS_CC );
+ intl_error_set_code( NULL, status );
/* Set error messages. */
- intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 0 TSRMLS_CC );
+ intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 0 );
if (uinput) {
efree( uinput );
}
@@ -136,7 +136,7 @@ PHP_FUNCTION( normalizer_normalize )
/* Bail out if an unexpected error occurred. */
if( U_FAILURE(status) ) {
/* Set error messages. */
- intl_error_set_custom_msg( NULL,"Error normalizing string", 0 TSRMLS_CC );
+ intl_error_set_custom_msg( NULL,"Error normalizing string", 0 );
efree( uret_buf );
efree( uinput );
RETURN_FALSE;
@@ -154,7 +154,7 @@ PHP_FUNCTION( normalizer_normalize )
if( U_FAILURE( status ) )
{
intl_error_set( NULL, status,
- "normalizer_normalize: error converting normalized text UTF-8", 0 TSRMLS_CC );
+ "normalizer_normalize: error converting normalized text UTF-8", 0 );
RETURN_FALSE;
}
@@ -183,14 +183,14 @@ PHP_FUNCTION( normalizer_is_normalized )
UBool uret = FALSE;
- intl_error_reset( NULL TSRMLS_CC );
+ intl_error_reset( NULL );
/* Parse parameters. */
- if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "s|l",
+ if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "s|l",
&input, &input_len, &form) == FAILURE )
{
intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
- "normalizer_is_normalized: unable to parse input params", 0 TSRMLS_CC );
+ "normalizer_is_normalized: unable to parse input params", 0 );
RETURN_FALSE;
}
@@ -205,7 +205,7 @@ PHP_FUNCTION( normalizer_is_normalized )
break;
default:
intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
- "normalizer_normalize: illegal normalization form", 0 TSRMLS_CC );
+ "normalizer_normalize: illegal normalization form", 0 );
RETURN_FALSE;
}
@@ -220,10 +220,10 @@ PHP_FUNCTION( normalizer_is_normalized )
if( U_FAILURE( status ) )
{
/* Set global error code. */
- intl_error_set_code( NULL, status TSRMLS_CC );
+ intl_error_set_code( NULL, status );
/* Set error messages. */
- intl_error_set_custom_msg( NULL, "Error converting string to UTF-16.", 0 TSRMLS_CC );
+ intl_error_set_custom_msg( NULL, "Error converting string to UTF-16.", 0 );
if (uinput) {
efree( uinput );
}
@@ -239,7 +239,7 @@ PHP_FUNCTION( normalizer_is_normalized )
/* Bail out if an unexpected error occurred. */
if( U_FAILURE(status) ) {
/* Set error messages. */
- intl_error_set_custom_msg( NULL,"Error testing if string is the given normalization form.", 0 TSRMLS_CC );
+ intl_error_set_custom_msg( NULL,"Error testing if string is the given normalization form.", 0 );
RETURN_FALSE;
}