com php-src: merge similar if conditions: ext/pcntl/pcntl.c
| From: | JulienPauli | Date: | Wed, 13 May 2015 13:34:17 +0000 |
| Subject: | com php-src: merge similar if conditions: ext/pcntl/pcntl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86747@lists.php.net to get a copy of this message | ||
Commit: 5c02e7e7fb2f7e9f959352bafd7bd8e1066dbec3
Author: Antony Dovgal <tony2001@php.net> Fri, 19 Dec 2014 14:57:41 +0300
Committer: Julien Pauli <jpauli@php.net> Wed, 13 May 2015 15:34:17 +0200
Parents: 7e0e88820a2cf6ef3804383413fe1b7f7538962a
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5c02e7e7fb2f7e9f959352bafd7bd8e1066dbec3
Log:
merge similar if conditions
Changed paths:
M ext/pcntl/pcntl.c
Diff:
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index f152ad8..bf2fcfe 100644
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -639,9 +639,7 @@ PHP_FUNCTION(pcntl_waitpid)
} else {
zend_hash_clean(Z_ARRVAL_P(z_rusage));
}
- }
- if (z_rusage) {
memset(&rusage, 0, sizeof(struct rusage));
child_id = wait4((pid_t) pid, &status, options, &rusage);
} else {
@@ -693,9 +691,7 @@ PHP_FUNCTION(pcntl_wait)
} else {
zend_hash_clean(Z_ARRVAL_P(z_rusage));
}
- }
- if (z_rusage) {
memset(&rusage, 0, sizeof(struct rusage));
child_id = wait3(&status, options, &rusage);
} else if (options) {