diff options
| author | Anatol Belski <ab@php.net> | 2014-12-13 23:06:14 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-13 23:06:14 +0100 |
| commit | bdeb220f48825642f84cdbf3ff23a30613c92e86 (patch) | |
| tree | 1a6cf34d20420e4815b4becb21311a4457d84103 /ext/intl/collator/collator_compare.c | |
| parent | bb66f385d09e7e55390e9f57fcbca08f6b43ff91 (diff) | |
| download | php-git-bdeb220f48825642f84cdbf3ff23a30613c92e86.tar.gz | |
first shot remove TSRMLS_* things
Diffstat (limited to 'ext/intl/collator/collator_compare.c')
| -rw-r--r-- | ext/intl/collator/collator_compare.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/intl/collator/collator_compare.c b/ext/intl/collator/collator_compare.c index d27ff32ebd..a7bc7f6383 100644 --- a/ext/intl/collator/collator_compare.c +++ b/ext/intl/collator/collator_compare.c @@ -46,11 +46,11 @@ PHP_FUNCTION( collator_compare ) COLLATOR_METHOD_INIT_VARS /* Parse parameters. */ - if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss", + if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Oss", &object, Collator_ce_ptr, &str1, &str1_len, &str2, &str2_len ) == FAILURE ) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, - "collator_compare: unable to parse input params", 0 TSRMLS_CC ); + "collator_compare: unable to parse input params", 0 ); RETURN_FALSE; } @@ -59,10 +59,10 @@ PHP_FUNCTION( collator_compare ) COLLATOR_METHOD_FETCH_OBJECT; if (!co || !co->ucoll) { - intl_error_set_code( NULL, COLLATOR_ERROR_CODE( co ) TSRMLS_CC ); + intl_error_set_code( NULL, COLLATOR_ERROR_CODE( co ) ); intl_errors_set_custom_msg( COLLATOR_ERROR_P( co ), - "Object not initialized", 0 TSRMLS_CC ); - php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "Object not initialized"); + "Object not initialized", 0 ); + php_error_docref(NULL, E_RECOVERABLE_ERROR, "Object not initialized"); RETURN_FALSE; } @@ -77,11 +77,11 @@ PHP_FUNCTION( collator_compare ) if( U_FAILURE( COLLATOR_ERROR_CODE( co ) ) ) { /* Set global error code. */ - intl_error_set_code( NULL, COLLATOR_ERROR_CODE( co ) TSRMLS_CC ); + intl_error_set_code( NULL, COLLATOR_ERROR_CODE( co ) ); /* Set error messages. */ intl_errors_set_custom_msg( COLLATOR_ERROR_P( co ), - "Error converting first argument to UTF-16", 0 TSRMLS_CC ); + "Error converting first argument to UTF-16", 0 ); if (ustr1) { efree( ustr1 ); } @@ -93,11 +93,11 @@ PHP_FUNCTION( collator_compare ) if( U_FAILURE( COLLATOR_ERROR_CODE( co ) ) ) { /* Set global error code. */ - intl_error_set_code( NULL, COLLATOR_ERROR_CODE( co ) TSRMLS_CC ); + intl_error_set_code( NULL, COLLATOR_ERROR_CODE( co ) ); /* Set error messages. */ intl_errors_set_custom_msg( COLLATOR_ERROR_P( co ), - "Error converting second argument to UTF-16", 0 TSRMLS_CC ); + "Error converting second argument to UTF-16", 0 ); if (ustr1) { efree( ustr1 ); } |