diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-09-29 11:17:43 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-09-29 11:17:43 +0300 |
| commit | 560e4fa39327e952652b6469d9644fc5fa2c15fa (patch) | |
| tree | b91589369c569d8efe84785303b58ad0fdd17c18 /ext/pcntl | |
| parent | 617bef558bbc8e2dd7682d9f407963b4a88092eb (diff) | |
| download | php-git-560e4fa39327e952652b6469d9644fc5fa2c15fa.tar.gz | |
Removed or simplified incorrect SEPARATE_*() macros usage.
Diffstat (limited to 'ext/pcntl')
| -rw-r--r-- | ext/pcntl/pcntl.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c index 2c2f41026d..c067d10387 100644 --- a/ext/pcntl/pcntl.c +++ b/ext/pcntl/pcntl.c @@ -1040,11 +1040,7 @@ PHP_FUNCTION(pcntl_sigprocmask) } ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(user_set), user_signo) { - if (Z_TYPE_P(user_signo) != IS_LONG) { - SEPARATE_ZVAL(user_signo); - convert_to_long_ex(user_signo); - } - signo = Z_LVAL_P(user_signo); + signo = zval_get_long(user_signo); if (sigaddset(&set, signo) != 0) { PCNTL_G(last_error) = errno; php_error_docref(NULL, E_WARNING, "%s", strerror(errno)); @@ -1105,11 +1101,7 @@ static void pcntl_sigwaitinfo(INTERNAL_FUNCTION_PARAMETERS, int timedwait) /* {{ } ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(user_set), user_signo) { - if (Z_TYPE_P(user_signo) != IS_LONG) { - SEPARATE_ZVAL(user_signo); - convert_to_long_ex(user_signo); - } - signo = Z_LVAL_P(user_signo); + signo = zval_get_long(user_signo); if (sigaddset(&set, signo) != 0) { PCNTL_G(last_error) = errno; php_error_docref(NULL, E_WARNING, "%s", strerror(errno)); |