summaryrefslogtreecommitdiff
path: root/ext/intl/transliterator
diff options
context:
space:
mode:
Diffstat (limited to 'ext/intl/transliterator')
-rw-r--r--ext/intl/transliterator/transliterator.c6
-rw-r--r--ext/intl/transliterator/transliterator_class.c8
-rw-r--r--ext/intl/transliterator/transliterator_methods.c22
3 files changed, 18 insertions, 18 deletions
diff --git a/ext/intl/transliterator/transliterator.c b/ext/intl/transliterator/transliterator.c
index 88e1225654..5f698e2b90 100644
--- a/ext/intl/transliterator/transliterator.c
+++ b/ext/intl/transliterator/transliterator.c
@@ -35,9 +35,9 @@ void transliterator_register_constants( INIT_FUNC_ARGS )
return;
}
- #define TRANSLITERATOR_EXPOSE_CONST( x ) REGISTER_INT_CONSTANT( #x, x, CONST_PERSISTENT | CONST_CS )
- #define TRANSLITERATOR_EXPOSE_CLASS_CONST( x ) zend_declare_class_constant_int( Transliterator_ce_ptr, ZEND_STRS( #x ) - 1, TRANSLITERATOR_##x TSRMLS_CC );
- #define TRANSLITERATOR_EXPOSE_CUSTOM_CLASS_CONST( name, value ) zend_declare_class_constant_int( Transliterator_ce_ptr, ZEND_STRS( name ) - 1, value TSRMLS_CC );*/
+ #define TRANSLITERATOR_EXPOSE_CONST( x ) REGISTER_LONG_CONSTANT( #x, x, CONST_PERSISTENT | CONST_CS )
+ #define TRANSLITERATOR_EXPOSE_CLASS_CONST( x ) zend_declare_class_constant_long( Transliterator_ce_ptr, ZEND_STRS( #x ) - 1, TRANSLITERATOR_##x TSRMLS_CC );
+ #define TRANSLITERATOR_EXPOSE_CUSTOM_CLASS_CONST( name, value ) zend_declare_class_constant_long( Transliterator_ce_ptr, ZEND_STRS( name ) - 1, value TSRMLS_CC );*/
/* Normalization form constants */
TRANSLITERATOR_EXPOSE_CLASS_CONST( FORWARD );
diff --git a/ext/intl/transliterator/transliterator_class.c b/ext/intl/transliterator/transliterator_class.c
index e5f26f2829..ff299a8f38 100644
--- a/ext/intl/transliterator/transliterator_class.c
+++ b/ext/intl/transliterator/transliterator_class.c
@@ -183,7 +183,7 @@ err:
err_msg = intl_error_get_message( TRANSLITERATOR_ERROR_P( to_orig ) TSRMLS_CC );
php_error_docref( NULL TSRMLS_CC, E_ERROR, "%s", err_msg->val );
- STR_FREE( err_msg ); /* if it's changed into a warning */
+ zend_string_free( err_msg ); /* if it's changed into a warning */
/* do not destroy tempz; we need to return something */
}
}
@@ -223,7 +223,7 @@ static zval *Transliterator_get_property_ptr_ptr( zval *object, zval *member, in
TRANSLITERATOR_PROPERTY_HANDLER_PROLOG;
if(zend_binary_strcmp( "id", sizeof( "id" ) - 1,
- Z_STRVAL_P( member ), Z_STRSIZE_P( member ) ) == 0 )
+ Z_STRVAL_P( member ), Z_STRLEN_P( member ) ) == 0 )
{
retval = NULL; /* fallback to read_property */
}
@@ -247,7 +247,7 @@ static zval *Transliterator_read_property( zval *object, zval *member, int type,
if( ( type != BP_VAR_R && type != BP_VAR_IS ) &&
( zend_binary_strcmp( "id", sizeof( "id" ) - 1,
- Z_STRVAL_P( member ), Z_STRSIZE_P( member ) ) == 0 ) )
+ Z_STRVAL_P( member ), Z_STRLEN_P( member ) ) == 0 ) )
{
php_error_docref0( NULL TSRMLS_CC, E_WARNING, "The property \"id\" is read-only" );
retval = &EG( uninitialized_zval );
@@ -272,7 +272,7 @@ static void Transliterator_write_property( zval *object, zval *member, zval *val
if( ( EG( scope ) != Transliterator_ce_ptr ) &&
( zend_binary_strcmp( "id", sizeof( "id" ) - 1,
- Z_STRVAL_P( member ), Z_STRSIZE_P( member ) ) == 0 ) )
+ Z_STRVAL_P( member ), Z_STRLEN_P( member ) ) == 0 ) )
{
php_error_docref0( NULL TSRMLS_CC, E_WARNING, "The property \"id\" is read-only" );
}
diff --git a/ext/intl/transliterator/transliterator_methods.c b/ext/intl/transliterator/transliterator_methods.c
index c4f620f9ca..e2b1929216 100644
--- a/ext/intl/transliterator/transliterator_methods.c
+++ b/ext/intl/transliterator/transliterator_methods.c
@@ -27,7 +27,7 @@
#include <zend_exceptions.h>
-static int create_transliterator( char *str_id, int str_id_len, php_int_t direction, zval *object TSRMLS_DC )
+static int create_transliterator( char *str_id, int str_id_len, zend_long direction, zval *object TSRMLS_DC )
{
Transliterator_object *to;
UChar *ustr_id = NULL;
@@ -105,14 +105,14 @@ PHP_FUNCTION( transliterator_create )
{
char *str_id;
int str_id_len;
- php_int_t direction = TRANSLITERATOR_FORWARD;
+ zend_long direction = TRANSLITERATOR_FORWARD;
int res;
TRANSLITERATOR_METHOD_INIT_VARS;
(void) to; /* unused */
- if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "s|i",
+ if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "s|l",
&str_id, &str_id_len, &direction ) == FAILURE )
{
intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
@@ -139,14 +139,14 @@ PHP_FUNCTION( transliterator_create_from_rules )
int str_rules_len;
UChar *ustr_rules = NULL;
int32_t ustr_rules_len = 0;
- php_int_t direction = TRANSLITERATOR_FORWARD;
+ zend_long direction = TRANSLITERATOR_FORWARD;
UParseError parse_error = {0, -1};
UTransliterator *utrans;
UChar id[] = {0x52, 0x75, 0x6C, 0x65, 0x73, 0x54, 0x72,
0x61, 0x6E, 0x73, 0x50, 0x48, 0x50, 0}; /* RulesTransPHP */
TRANSLITERATOR_METHOD_INIT_VARS;
- if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "s|i",
+ if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "s|l",
&str_rules, &str_rules_len, &direction ) == FAILURE )
{
intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
@@ -307,7 +307,7 @@ PHP_FUNCTION( transliterator_transliterate )
int32_t ustr_len = 0,
capacity,
uresult_len;
- php_int_t start = 0,
+ zend_long start = 0,
limit = -1;
int success = 0;
zval tmp_object;
@@ -320,7 +320,7 @@ PHP_FUNCTION( transliterator_transliterate )
{
/* in non-OOP version, accept both a transliterator and a string */
zval *arg1;
- if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "zs|ii",
+ if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "zs|ll",
&arg1, &str, &str_len, &start, &limit ) == FAILURE )
{
intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
@@ -342,20 +342,20 @@ PHP_FUNCTION( transliterator_transliterate )
convert_to_string( arg1 );
}
object = &tmp_object;
- res = create_transliterator( Z_STRVAL_P( arg1 ), Z_STRSIZE_P( arg1 ),
+ res = create_transliterator( Z_STRVAL_P( arg1 ), Z_STRLEN_P( arg1 ),
TRANSLITERATOR_FORWARD, object TSRMLS_CC );
if( res == FAILURE )
{
zend_string *message = intl_error_get_message( NULL TSRMLS_CC );
php_error_docref0( NULL TSRMLS_CC, E_WARNING, "Could not create "
"transliterator with ID \"%s\" (%s)", Z_STRVAL_P( arg1 ), message->val );
- STR_FREE( message );
+ zend_string_free( message );
/* don't set U_ILLEGAL_ARGUMENT_ERROR to allow fetching of inner error */
goto cleanup;
}
}
}
- else if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "s|ii",
+ else if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "s|ll",
&str, &str_len, &start, &limit ) == FAILURE )
{
intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
@@ -497,7 +497,7 @@ PHP_FUNCTION( transliterator_get_error_code )
if (to == NULL )
RETURN_FALSE;
- RETURN_INT( (php_int_t) TRANSLITERATOR_ERROR_CODE( to ) );
+ RETURN_LONG( (zend_long) TRANSLITERATOR_ERROR_CODE( to ) );
}
/* }}} */
View Lorry Controller Status