Fix [-Werror=missing-braces] compiler warning

Girgias · Girgias · commit 446724bcd901 · 2020-04-13T23:03:31.000+02:00
Partial fix to bug 79431
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
@@ -46,7 +46,7 @@ ZEND_API void (*zend_execute_ex)(zend_execute_data *execute_data);
 ZEND_API void (*zend_execute_internal)(zend_execute_data *execute_data, zval *return_value);
 
 /* true globals */
-ZEND_API const zend_fcall_info empty_fcall_info = { 0, {{0}, {{0}}, {0}}, NULL, NULL, NULL, 0, 0 };
+ZEND_API const zend_fcall_info empty_fcall_info = {0};
 ZEND_API const zend_fcall_info_cache empty_fcall_info_cache = { NULL, NULL, NULL, NULL };
 
 #ifdef ZEND_WIN32
diff --git a/Zend/zend_types.h b/Zend/zend_types.h
@@ -302,6 +302,7 @@ typedef union _zend_value {
 struct _zval_struct {
 	zend_value        value;			/* value */
 	union {
+		uint32_t type_info;
 		struct {
 			ZEND_ENDIAN_LOHI_3(
 				zend_uchar    type,			/* active type */
@@ -310,7 +311,6 @@ struct _zval_struct {
 					uint16_t  extra;        /* not further specified */
 				} u)
 		} v;
-		uint32_t type_info;
 	} u1;
 	union {
 		uint32_t     next;                 /* hash collision chain */
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
@@ -750,7 +750,7 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value, enum pdo_
 {
 	int flags, idx, old_arg_count = 0;
 	zend_class_entry *ce = NULL, *old_ce = NULL;
-	zval grp_val, *pgrp, retval, old_ctor_args = {{0}, {{0}}, {0}};
+	zval grp_val, *pgrp, retval, old_ctor_args = {{0}, {0}, {0}};
 	int colno;
 
 	if (how == PDO_FETCH_USE_DEFAULT) {

Original file line number	Diff line number	Diff line change
`@@ -750,7 +750,7 @@ static int do_fetch(pdo_stmt_t stmt, int do_bind, zval return_value, enum pdo_`
`750`	`750`	`{`
`751`	`751`	`int flags, idx, old_arg_count = 0;`
`752`	`752`	`zend_class_entry ce = NULL, old_ce = NULL;`
`753`		`- zval grp_val, *pgrp, retval, old_ctor_args = {{0}, {{0}}, {0}};`
	`753`	`+ zval grp_val, *pgrp, retval, old_ctor_args = {{0}, {0}, {0}};`
`754`	`754`	`int colno;`
`755`	`755`
`756`	`756`	`if (how == PDO_FETCH_USE_DEFAULT) {`