diff options
Diffstat (limited to 'ext/intl/common/common_error.c')
| -rw-r--r-- | ext/intl/common/common_error.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/intl/common/common_error.c b/ext/intl/common/common_error.c index a0ee7c145f..524bb94327 100644 --- a/ext/intl/common/common_error.c +++ b/ext/intl/common/common_error.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -37,8 +37,7 @@ PHP_FUNCTION( intl_get_error_code ) */ PHP_FUNCTION( intl_get_error_message ) { - char* message = intl_error_get_message( NULL TSRMLS_CC ); - RETURN_STRING( message, FALSE ); + RETURN_STR(intl_error_get_message( NULL TSRMLS_CC )); } /* }}} */ @@ -49,7 +48,7 @@ PHP_FUNCTION( intl_get_error_message ) */ PHP_FUNCTION( intl_is_failure ) { - long err_code; + zend_long err_code; /* Parse parameters. */ if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "l", @@ -63,6 +62,7 @@ PHP_FUNCTION( intl_is_failure ) RETURN_BOOL( U_FAILURE( err_code ) ); } +/* }}} */ /* {{{ proto string intl_error_name() * Return a string for a given error code. @@ -70,7 +70,7 @@ PHP_FUNCTION( intl_is_failure ) */ PHP_FUNCTION( intl_error_name ) { - long err_code; + zend_long err_code; /* Parse parameters. */ if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "l", @@ -82,7 +82,7 @@ PHP_FUNCTION( intl_error_name ) RETURN_FALSE; } - RETURN_STRING( (char*)u_errorName( err_code ), 1 ); + RETURN_STRING( (char*)u_errorName( err_code ) ); } /* }}} */ @@ -91,7 +91,7 @@ PHP_FUNCTION( intl_error_name ) */ void intl_expose_icu_error_codes( INIT_FUNC_ARGS ) { - #define INTL_EXPOSE_CONST(x) REGISTER_LONG_CONSTANT(#x, x, CONST_CS) + #define INTL_EXPOSE_CONST(x) REGISTER_LONG_CONSTANT(#x, x, CONST_PERSISTENT | CONST_CS) /* Warnings */ INTL_EXPOSE_CONST( U_USING_FALLBACK_WARNING ); |