From: Antony Dovgal <tony2001@php.net>
Date: Fri, 19 Dec 2014 11:57:41 +0000 (+0300)
Subject: merge similar if conditions
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~42^2~84
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c02e7e7fb2f7e9f959352bafd7bd8e1066dbec3;p=php

merge similar if conditions
---

diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index f152ad8814..bf2fcfe525 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) {