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/pcntl/pcntl.c | |
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/pcntl/pcntl.c')
-rw-r--r-- | ext/pcntl/pcntl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c index bf2fcfe525..6661c2a715 100644 --- a/ext/pcntl/pcntl.c +++ b/ext/pcntl/pcntl.c @@ -908,9 +908,9 @@ PHP_FUNCTION(pcntl_exec) convert_to_string_ex(element); /* Length of element + equal sign + length of key + null */ - pair_length = Z_STRLEN_P(element) + key->len + 2; + pair_length = Z_STRLEN_P(element) + ZSTR_LEN(key) + 2; *pair = emalloc(pair_length); - strlcpy(*pair, key->val, key->len + 1); + strlcpy(*pair, ZSTR_VAL(key), ZSTR_LEN(key) + 1); strlcat(*pair, "=", pair_length); strlcat(*pair, Z_STRVAL_P(element), pair_length); @@ -991,7 +991,7 @@ PHP_FUNCTION(pcntl_signal) if (!zend_is_callable(handle, 0, &func_name)) { PCNTL_G(last_error) = EINVAL; - php_error_docref(NULL, E_WARNING, "%s is not a callable function name error", func_name->val); + php_error_docref(NULL, E_WARNING, "%s is not a callable function name error", ZSTR_VAL(func_name)); zend_string_release(func_name); RETURN_FALSE; } |