Minor conditions simplify

Author: mvorisek

ext/phar/phar.c

@@ -1965,7 +1965,7 @@ int phar_detect_phar_fname_ext(const char *filename, size_t filename_len, const
 	*ext_str = NULL;
 	*ext_len = 0;
 
-	if (!filename_len || filename_len == 1) {
+	if (filename_len <= 1) {
 		return FAILURE;
 	}
 

ext/phar/phar_object.c

@@ -482,7 +482,7 @@ PHP_METHOD(Phar, mount)
 carry_on:
 		if (SUCCESS != phar_mount_entry(pphar, actual, actual_len, path, path_len)) {
 			zend_throw_exception_ex(phar_ce_PharException, 0, "Mounting of %s to %s within phar %s failed", path, actual, arch);
-			if (path && path == entry) {
+			if (entry && path == entry) {
 				efree(entry);
 			}
 
@@ -493,7 +493,7 @@ PHP_METHOD(Phar, mount)
 			goto finish;
 		}
 
-		if (entry && path && path == entry) {
+		if (entry && path == entry) {
 			efree(entry);
 		}
 

ext/phar/util.c

@@ -1247,7 +1247,7 @@ phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, char *path, si
 	}
 
 	if (is_dir) {
-		if (!path_len || path_len == 1) {
+		if (path_len <= 1) {
 			return NULL;
 		}
 		path_len--;

ext/reflection/php_reflection.c

@@ -3541,7 +3541,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, inNamespace)
 
 	zend_string *name = fptr->common.function_name;
 	const char *backslash = zend_memrchr(ZSTR_VAL(name), '\\', ZSTR_LEN(name));
-	RETURN_BOOL(backslash && backslash > ZSTR_VAL(name));
+	RETURN_BOOL(backslash > ZSTR_VAL(name));
 }
 /* }}} */
 
@@ -3559,7 +3559,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, getNamespaceName)
 
 	zend_string *name = fptr->common.function_name;
 	const char *backslash = zend_memrchr(ZSTR_VAL(name), '\\', ZSTR_LEN(name));
-	if (backslash && backslash > ZSTR_VAL(name)) {
+	if (backslash > ZSTR_VAL(name)) {
 		RETURN_STRINGL(ZSTR_VAL(name), backslash - ZSTR_VAL(name));
 	}
 	RETURN_EMPTY_STRING();
@@ -3580,7 +3580,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, getShortName)
 
 	zend_string *name = fptr->common.function_name;
 	const char *backslash = zend_memrchr(ZSTR_VAL(name), '\\', ZSTR_LEN(name));
-	if (backslash && backslash > ZSTR_VAL(name)) {
+	if (backslash > ZSTR_VAL(name)) {
 		RETURN_STRINGL(backslash + 1, ZSTR_LEN(name) - (backslash - ZSTR_VAL(name) + 1));
 	}
 	RETURN_STR_COPY(name);
@@ -5408,7 +5408,7 @@ ZEND_METHOD(ReflectionClass, inNamespace)
 
 	zend_string *name = ce->name;
 	const char *backslash = zend_memrchr(ZSTR_VAL(name), '\\', ZSTR_LEN(name));
-	RETURN_BOOL(backslash && backslash > ZSTR_VAL(name));
+	RETURN_BOOL(backslash > ZSTR_VAL(name));
 }
 /* }}} */
 
@@ -5426,7 +5426,7 @@ ZEND_METHOD(ReflectionClass, getNamespaceName)
 
 	zend_string *name = ce->name;
 	const char *backslash = zend_memrchr(ZSTR_VAL(name), '\\', ZSTR_LEN(name));
-	if (backslash && backslash > ZSTR_VAL(name)) {
+	if (backslash > ZSTR_VAL(name)) {
 		RETURN_STRINGL(ZSTR_VAL(name), backslash - ZSTR_VAL(name));
 	}
 	RETURN_EMPTY_STRING();
@@ -5447,7 +5447,7 @@ ZEND_METHOD(ReflectionClass, getShortName)
 
 	zend_string *name = ce->name;
 	const char *backslash = zend_memrchr(ZSTR_VAL(name), '\\', ZSTR_LEN(name));
-	if (backslash && backslash > ZSTR_VAL(name)) {
+	if (backslash > ZSTR_VAL(name)) {
 		RETURN_STRINGL(backslash + 1, ZSTR_LEN(name) - (backslash - ZSTR_VAL(name) + 1));
 	}
 	RETURN_STR_COPY(name);

run-tests.php

@@ -3945,7 +3945,7 @@ private function readFile(): void
             if (preg_match('/^--([_A-Z]+)--/', $line, $r)) {
                 $section = (string) $r[1];
 
-                if (isset($this->sections[$section]) && $this->sections[$section]) {
+                if (isset($this->sections[$section])) {
                     throw new BorkageException("duplicated $section section");
                 }
 

sapi/fpm/status.html.in

@@ -215,7 +215,7 @@
 					doc_rate.disabled = false;
 				} else {
 					delay = parseInt(doc_rate.value);
-					if (!delay || delay < 1) {
+					if (delay < 1) {
 						doc_status.innerHTML = "Not valid 'refresh' value";
 						return;
 					}