Merge tag 'unicode-next-v5.4' of... (040823b5) · Commits · 戴 / test

Merge tag 'unicode-next-v5.4' of https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode into dev fs/unicode patches for 5.4-rc1 This includes two fixes for the unicode system for inclusion into Linux v5.4. - A patch from Krzysztof Wilczynski solving a build time warning. - A patch from Colin King making a parsing format static, to reduce stack size. Build validated and run time tested using xfstests casefold testcase. Signed-off-by:

Gabriel Krisman Bertazi <krisman@collabora.com>

fs/unicode/utf8-core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -154,7 +154,7 @@ static int utf8_parse_version(const char version, unsigned int maj,
		{
		substring_t args[3];
		char version_string[12];
		const struct match_token token[] = {
		static const struct match_token token[] = {
		{1, "%d.%d.%d"},
		{0, NULL}
		};

fs/unicode/utf8-selftest.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ unsigned int total_tests;
		#define test_f(cond, fmt, ...) _test(cond, __func__, __LINE__, fmt, ##__VA_ARGS__)
		#define test(cond) _test(cond, __func__, __LINE__, "")

		const static struct {
		static const struct {
		/* UTF-8 strings in this vector _must_ be NULL-terminated. */
		unsigned char str[10];
		unsigned char dec[10];
		@@ -89,7 +89,7 @@ const static struct {

		};

		const static struct {
		static const struct {
		/* UTF-8 strings in this vector _must_ be NULL-terminated. */
		unsigned char str[30];
		unsigned char ncf[30];

Admin message