Fix [-Wimplicit-fallthrough] warnings in MBString extension

Girgias · Girgias · commit 690b757d7f87 · 2020-11-03T10:47:25.000Z
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c
@@ -367,6 +367,7 @@ mbfl_filt_conv_wchar_sjis_mac(int c, mbfl_convert_filter *filter)
 		if (s2 <= 0 || s1 == -1) {
 			break;
 		}
+		fallthrough;
 
 	case 0:
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_uhc.c b/ext/mbstring/libmbfl/filters/mbfilter_uhc.c
@@ -236,7 +236,7 @@ static int mbfl_filt_ident_uhc(int c, mbfl_identify_filter *filter)
 		} else { /* bad */
 			filter->flag = 1;
 		}
-
+		fallthrough;
 	case 1:
 	case 2:
 		if (c < 0x41 || (c > 0x5a && c < 0x61)
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
@@ -3357,7 +3357,7 @@ static int _php_mbstr_parse_mail_headers(HashTable *ht, const char *str, size_t
 							state = 3;
 							break;
 						}
-						/* break is missing intentionally */
+						fallthrough;
 
 					case 3:
 						if (crlf_state == -1) {

Original file line number	Diff line number	Diff line change
`@@ -367,6 +367,7 @@ mbfl_filt_conv_wchar_sjis_mac(int c, mbfl_convert_filter *filter)`
`367`	`367`	`if (s2 <= 0 \|\| s1 == -1) {`
`368`	`368`	`break;`
`369`	`369`	`}`
	`370`	`+ fallthrough;`
`370`	`371`
`371`	`372`	`case 0:`
`372`	`373`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ static int mbfl_filt_ident_uhc(int c, mbfl_identify_filter *filter)`
`236`	`236`	`} else { /* bad */`
`237`	`237`	`filter->flag = 1;`
`238`	`238`	`}`
`239`		`-`
	`239`	`+ fallthrough;`
`240`	`240`	`case 1:`
`241`	`241`	`case 2:`
`242`	`242`	`if (c < 0x41 \|\| (c > 0x5a && c < 0x61)`
Original file line number	Diff line number	Diff line change
`@@ -3357,7 +3357,7 @@ static int _php_mbstr_parse_mail_headers(HashTable ht, const char str, size_t`
`3357`	`3357`	`state = 3;`
`3358`	`3358`	`break;`
`3359`	`3359`	`}`
`3360`		`- /* break is missing intentionally */`
	`3360`	`+ fallthrough;`
`3361`	`3361`
`3362`	`3362`	`case 3:`
`3363`	`3363`	`if (crlf_state == -1) {`