Merge branch 'macos-missing-field-initializers-warnings' into add-compiler-warnings

Girgias · Girgias · commit 2f9730704638 · 2020-02-27T23:35:10.000+01:00
* macos-missing-field-initializers-warnings:
  Use {0} to initialize instead of {NULL}
diff --git a/ext/phar/func_interceptors.c b/ext/phar/func_interceptors.c
@@ -1100,7 +1100,7 @@ static struct _phar_orig_functions {
 	zif_handler orig_lstat;
 	zif_handler orig_readfile;
 	zif_handler orig_stat;
-} phar_orig_functions = {NULL};
+} phar_orig_functions = {0};
 
 void phar_save_orig_functions(void) /* {{{ */
 {
diff --git a/ext/standard/html.c b/ext/standard/html.c
@@ -1026,7 +1026,7 @@ static const entity_ht *unescape_inverse_map(int all, int flags)
  * unicode code points */
 static entity_table_opt determine_entity_table(int all, int doctype)
 {
-	entity_table_opt retval = {NULL};
+	entity_table_opt retval = {0};
 
 	assert(!(doctype == ENT_HTML_DOC_XML1 && all));
 

Original file line number	Diff line number	Diff line change
`@@ -1100,7 +1100,7 @@ static struct _phar_orig_functions {`
`1100`	`1100`	`zif_handler orig_lstat;`
`1101`	`1101`	`zif_handler orig_readfile;`
`1102`	`1102`	`zif_handler orig_stat;`
`1103`		`-} phar_orig_functions = {NULL};`
	`1103`	`+} phar_orig_functions = {0};`
`1104`	`1104`
`1105`	`1105`	`void phar_save_orig_functions(void) /* {{{ */`
`1106`	`1106`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1026,7 +1026,7 @@ static const entity_ht *unescape_inverse_map(int all, int flags)`
`1026`	`1026`	`* unicode code points */`
`1027`	`1027`	`static entity_table_opt determine_entity_table(int all, int doctype)`
`1028`	`1028`	`{`
`1029`		`- entity_table_opt retval = {NULL};`
	`1029`	`+ entity_table_opt retval = {0};`
`1030`	`1030`
`1031`	`1031`	`assert(!(doctype == ENT_HTML_DOC_XML1 && all));`
`1032`	`1032`