diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-06-30 04:05:24 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-06-30 04:05:24 +0300 |
| commit | 4a2e40bb861bc3cf5fb6863e57486ed60316e97c (patch) | |
| tree | 6579660b282fdd1bc50095e48d702913a0b6aa97 /ext/intl/transliterator | |
| parent | 8cce5b2641fb91c3073018b59f6f044b843041a8 (diff) | |
| download | php-git-4a2e40bb861bc3cf5fb6863e57486ed60316e97c.tar.gz | |
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
Diffstat (limited to 'ext/intl/transliterator')
| -rw-r--r-- | ext/intl/transliterator/transliterator_class.c | 2 | ||||
| -rw-r--r-- | ext/intl/transliterator/transliterator_methods.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/intl/transliterator/transliterator_class.c b/ext/intl/transliterator/transliterator_class.c index 4395cc086a..f2cb9f42e4 100644 --- a/ext/intl/transliterator/transliterator_class.c +++ b/ext/intl/transliterator/transliterator_class.c @@ -182,7 +182,7 @@ err: "Could not clone transliterator", 0 ); err_msg = intl_error_get_message( TRANSLITERATOR_ERROR_P( to_orig ) ); - php_error_docref( NULL, E_ERROR, "%s", err_msg->val ); + php_error_docref( NULL, E_ERROR, "%s", ZSTR_VAL(err_msg) ); zend_string_free( err_msg ); /* if it's changed into a warning */ /* do not destroy tempz; we need to return something */ } diff --git a/ext/intl/transliterator/transliterator_methods.c b/ext/intl/transliterator/transliterator_methods.c index ced84a0c60..4fcdf3dea2 100644 --- a/ext/intl/transliterator/transliterator_methods.c +++ b/ext/intl/transliterator/transliterator_methods.c @@ -185,7 +185,7 @@ PHP_FUNCTION( transliterator_create_from_rules ) smart_str parse_error_str; parse_error_str = intl_parse_error_to_string( &parse_error ); spprintf( &msg, 0, "transliterator_create_from_rules: unable to " - "create ICU transliterator from rules (%s)", parse_error_str.s? parse_error_str.s->val : "" ); + "create ICU transliterator from rules (%s)", parse_error_str.s? ZSTR_VAL(parse_error_str.s) : "" ); smart_str_free( &parse_error_str ); if( msg != NULL ) { @@ -348,7 +348,7 @@ PHP_FUNCTION( transliterator_transliterate ) { zend_string *message = intl_error_get_message( NULL ); php_error_docref0( NULL, E_WARNING, "Could not create " - "transliterator with ID \"%s\" (%s)", Z_STRVAL_P( arg1 ), message->val ); + "transliterator with ID \"%s\" (%s)", Z_STRVAL_P( arg1 ), ZSTR_VAL(message) ); zend_string_free( message ); ZVAL_UNDEF(&tmp_object); /* don't set U_ILLEGAL_ARGUMENT_ERROR to allow fetching of inner error */ |