more of the same

Author: nielsdos

Zend/zend_API.c

@@ -525,27 +525,21 @@ static ZEND_COLD bool zend_null_arg_deprecated(const char *fallback_type, uint32
 
 ZEND_API zend_opt_bool ZEND_FASTCALL zend_parse_arg_bool_weak(const zval *arg, uint32_t arg_num) /* {{{ */
 {
-	zend_opt_bool result;
 	if (EXPECTED(Z_TYPE_P(arg) <= IS_STRING)) {
 		if (UNEXPECTED(Z_TYPE_P(arg) == IS_NULL) && !zend_null_arg_deprecated("bool", arg_num)) {
-			result.has_value = false;
-			return result;
+			return (zend_opt_bool){false, false};
 		}
-		result.value = zend_is_true(arg);
-		result.has_value = true;
+		return (zend_opt_bool){zend_is_true(arg), true};
 	} else {
-		result.has_value = false;
+		return (zend_opt_bool){false, false};
 	}
-	return result;
 }
 /* }}} */
 
 ZEND_API zend_opt_bool ZEND_FASTCALL zend_parse_arg_bool_slow(const zval *arg, uint32_t arg_num) /* {{{ */
 {
 	if (UNEXPECTED(ZEND_ARG_USES_STRICT_TYPES())) {
-		zend_opt_bool result;
-		result.has_value = false;
-		return result;
+		return (zend_opt_bool){false, false};
 	}
 	return zend_parse_arg_bool_weak(arg, arg_num);
 }
@@ -554,9 +548,7 @@ ZEND_API zend_opt_bool ZEND_FASTCALL zend_parse_arg_bool_slow(const zval *arg, u
 ZEND_API zend_opt_bool ZEND_FASTCALL zend_flf_parse_arg_bool_slow(const zval *arg, uint32_t arg_num)
 {
 	if (UNEXPECTED(ZEND_FLF_ARG_USES_STRICT_TYPES())) {
-		zend_opt_bool result;
-		result.has_value = false;
-		return result;
+		return (zend_opt_bool){false, false};
 	}
 	return zend_parse_arg_bool_weak(arg, arg_num);
 }
@@ -703,10 +695,7 @@ ZEND_API zend_opt_double ZEND_FASTCALL zend_parse_arg_double_slow(const zval *ar
 {
 	if (EXPECTED(Z_TYPE_P(arg) == IS_LONG)) {
 		/* SSTH Exception: IS_LONG may be accepted instead as IS_DOUBLE */
-		zend_opt_double result;
-		result.has_value = true;
-		result.value = (double)Z_LVAL_P(arg);
-		return result;
+		return (zend_opt_double){(double)Z_LVAL_P(arg), true};
 	} else if (UNEXPECTED(ZEND_ARG_USES_STRICT_TYPES())) {
 		zend_opt_double result;
 		result.has_value = false;