Commit 719419a

authored

Fix unterminated string GCC warnings in mbstring (#19192)

Necessary for for Werror builds

1 parent d292968 commit 719419aCopy full SHA for 719419a

File tree

-4

lines changed

-4

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,15 +21,15 @@`
`21`	`21`	`* This macro converts uppercase ASCII values to Regional Indicator codepoints */`
`22`	`22`	`#define NFLAGS(c) (0x1F1A5+((unsigned int)(c)))`
`23`	`23`
`24`		`-static const char nflags_s[10][2] = {"CN", "DE", "ES", "FR", "GB", "IT", "JP", "KR", "RU", "US"};`
	`24`	`+static const char nflags_s[10][2] ZEND_NONSTRING= {"CN", "DE", "ES", "FR", "GB", "IT", "JP", "KR", "RU", "US"};`
`25`	`25`	`static const int nflags_code_kddi[10] = { 0x2549, 0x2546, 0x24C0, 0x2545, 0x2548, 0x2547, 0x2750, 0x254A, 0x24C1, 0x27F7 };`
`26`	`26`	`static const int nflags_code_sb[10] = { 0x2B0A, 0x2B05, 0x2B08, 0x2B04, 0x2B07, 0x2B06, 0x2B02, 0x2B0B, 0x2B09, 0x2B03 };`
`27`	`27`
`28`	`28`	`#define EMIT_KEYPAD_EMOJI(c) do { *snd = (c); return 0x20E3; } while(0)`
`29`	`29`	`#define EMIT_FLAG_EMOJI(country) do { *snd = NFLAGS((country)[0]); return NFLAGS((country)[1]); } while(0)`
`30`	`30`
`31`		`-static const char nflags_kddi[6][2] = {"FR", "DE", "IT", "GB", "CN", "KR"};`
`32`		`-static const char nflags_sb[10][2] = {"JP", "US", "FR", "DE", "IT", "GB", "ES", "RU", "CN", "KR"};`
	`31`	`+static const char nflags_kddi[6][2] ZEND_NONSTRING= {"FR", "DE", "IT", "GB", "CN", "KR"};`
	`32`	`+static const char nflags_sb[10][2] ZEND_NONSTRING= {"JP", "US", "FR", "DE", "IT", "GB", "ES", "RU", "CN", "KR"};`
`33`	`33`
`34`	`34`	`/* number -> (ku94)+ten value for telephone keypad character /`
`35`	`35`	`#define DOCOMO_KEYPAD(n) ((n) == 0 ? 0x296F : (0x2965 + (n)))`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -725,7 +725,7 @@ static int mbfl_filt_conv_wchar_utf8_mobile(int c, mbfl_convert_filter *filter)`
`725`	`725`	`* This macro converts uppercase ASCII values to Regional Indicator codepoints */`
`726`	`726`	`#define NFLAGS(c) (0x1F1A5+(int)(c))`
`727`	`727`
`728`		`-static const char nflags_s[10][2] = {"CN","DE","ES","FR","GB","IT","JP","KR","RU","US"};`
	`728`	`+static const char nflags_s[10][2] ZEND_NONSTRING= {"CN","DE","ES","FR","GB","IT","JP","KR","RU","US"};`
`729`	`729`	`static const int nflags_code_kddi[10] = { 0x2549, 0x2546, 0x24C0, 0x2545, 0x2548, 0x2547, 0x2750, 0x254A, 0x24C1, 0x27F7 };`
`730`	`730`	`static const int nflags_code_sb[10] = { 0x2B0A, 0x2B05, 0x2B08, 0x2B04, 0x2B07, 0x2B06, 0x2B02, 0x2B0B, 0x2B09, 0x2B03 };`
`731`	`731`

Comments

(0)