diff options
| author | Florian MARGAINE <florian@margaine.com> | 2014-09-20 10:09:21 +0200 |
|---|---|---|
| committer | Florian MARGAINE <florian@margaine.com> | 2014-09-20 10:09:21 +0200 |
| commit | 8eb7e7bf7f63f49e97f112871df47c6d6213e715 (patch) | |
| tree | 24b9059118cf6abb5fe0837eaa477b4668b18435 /ext/exif | |
| parent | 58ed832fc99d5c5aeac7849819bbc4e0dc90d698 (diff) | |
| parent | 95836a350420cabc2e8e5f5c45131fba46504a3b (diff) | |
| download | php-git-8eb7e7bf7f63f49e97f112871df47c6d6213e715.tar.gz | |
Merge branch 'master' into issue-67910
Conflicts:
README.PARAMETER_PARSING_API
ext/gmp/tests/001.phpt
Diffstat (limited to 'ext/exif')
| -rw-r--r-- | ext/exif/exif.c | 16 | ||||
| -rw-r--r-- | ext/exif/php_exif.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 9b6d86c415..42f8a24102 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ @@ -166,17 +166,17 @@ ZEND_DECLARE_MODULE_GLOBALS(exif) ZEND_INI_MH(OnUpdateEncode) { - if (new_value && new_value_length) { + if (new_value && new_value->len) { const zend_encoding **return_list; size_t return_size; - if (FAILURE == zend_multibyte_parse_encoding_list(new_value, new_value_length, + if (FAILURE == zend_multibyte_parse_encoding_list(new_value->val, new_value->len, &return_list, &return_size, 0 TSRMLS_CC)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Illegal encoding ignored: '%s'", new_value); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Illegal encoding ignored: '%s'", new_value->val); return FAILURE; } efree(return_list); } - return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); + return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); } ZEND_INI_MH(OnUpdateDecode) @@ -184,14 +184,14 @@ ZEND_INI_MH(OnUpdateDecode) if (new_value) { const zend_encoding **return_list; size_t return_size; - if (FAILURE == zend_multibyte_parse_encoding_list(new_value, new_value_length, + if (FAILURE == zend_multibyte_parse_encoding_list(new_value->val, new_value->len, &return_list, &return_size, 0 TSRMLS_CC)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Illegal encoding ignored: '%s'", new_value); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Illegal encoding ignored: '%s'", new_value->val); return FAILURE; } efree(return_list); } - return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); + return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); } PHP_INI_BEGIN() diff --git a/ext/exif/php_exif.h b/ext/exif/php_exif.h index e0326752e6..8c2c207fa9 100644 --- a/ext/exif/php_exif.h +++ b/ext/exif/php_exif.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ |