diff options
| author | Stanley Sufficool <ssufficool@php.net> | 2014-10-20 21:33:32 -0700 |
|---|---|---|
| committer | Stanley Sufficool <ssufficool@php.net> | 2014-10-20 21:33:32 -0700 |
| commit | 8defcb855ab01d9c8ab4759cb793d80149b55a8c (patch) | |
| tree | ed51eb30a2cbc92b102557498fb3e4113da1bb07 /ext/intl/collator/collator_error.c | |
| parent | 9c7dbb0487f5991fde03873ea8f5e66d6688415f (diff) | |
| parent | baddb1c73a170ef1d2c31bd54cddbc6e1ab596b9 (diff) | |
| download | php-git-8defcb855ab01d9c8ab4759cb793d80149b55a8c.tar.gz | |
Merge branch 'master' of https://git.php.net/push/php-src
* 'master' of https://git.php.net/push/php-src: (6215 commits)
Extra comma
Moved proxy object support in ASSIGN_ADD (and family) from VM to slow paths of corresponding operators
Simplification
zend_get_property_info_quick() cleanup and optimization
initialize lineno before calling compile file file in phar
Use ADDREF instead of DUP, it must be enough.
Removed old irrelevant comment
fixed compilation error
Fix bug #68262: Broken reference across cloned objects
export functions needed for phpdbg
Fixed compilation
Optimized property access handlers. Removed EG(std_property_info).
Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads)
Don't make difference between undefined and unaccessible properies when call __get() and family
Don't make useless CSE
array_pop/array_shift optimization
check for zlib headers as well as lib for mysqlnd
a realpath cache key can be int or float, catching this
News entry for new curl constants
News entry for new curl constants
...
Diffstat (limited to 'ext/intl/collator/collator_error.c')
| -rw-r--r-- | ext/intl/collator/collator_error.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/intl/collator/collator_error.c b/ext/intl/collator/collator_error.c index c4e41250a2..fb8886ef64 100644 --- a/ext/intl/collator/collator_error.c +++ b/ext/intl/collator/collator_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 | @@ -43,7 +43,7 @@ PHP_FUNCTION( collator_get_error_code ) } /* Fetch the object (without resetting its last error code). */ - co = (Collator_object *) zend_object_store_get_object(object TSRMLS_CC); + co = Z_INTL_COLLATOR_P(object); if( co == NULL ) RETURN_FALSE; @@ -59,7 +59,7 @@ PHP_FUNCTION( collator_get_error_code ) */ PHP_FUNCTION( collator_get_error_message ) { - const char* message = NULL; + zend_string* message = NULL; COLLATOR_METHOD_INIT_VARS @@ -74,13 +74,13 @@ PHP_FUNCTION( collator_get_error_message ) } /* Fetch the object (without resetting its last error code). */ - co = (Collator_object *) zend_object_store_get_object( object TSRMLS_CC ); + co = Z_INTL_COLLATOR_P( object ); if( co == NULL ) RETURN_FALSE; /* Return last error message. */ message = intl_error_get_message( COLLATOR_ERROR_P( co ) TSRMLS_CC ); - RETURN_STRING( (char*)message, FALSE ); + RETURN_STR(message); } /* }}} */ |