Commit 379210db authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Gabriel Krisman Bertazi
Browse files

unicode: remove the unused utf8{,n}age{min,max} functions 



No actually used anywhere.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarGabriel Krisman Bertazi <krisman@collabora.com>
parent 49bd03cc

fs/unicode/utf8-norm.c

+0 −113
Original line number Diff line number Diff line
@@ -391,119 +391,6 @@ static utf8leaf_t *utf8lookup(const struct utf8data *data, 
	return utf8nlookup(data, hangul, s, (size_t)-1);

}



/*

 * Maximum age of any character in s.

 * Return -1 if s is not valid UTF-8 unicode.

 * Return 0 if only non-assigned code points are used.

 */

int utf8agemax(const struct utf8data *data, const char *s)

{

	utf8leaf_t	*leaf;

	int		age = 0;

	int		leaf_age;

	unsigned char	hangul[UTF8HANGULLEAF];



	if (!data)

		return -1;



	while (*s) {

		leaf = utf8lookup(data, hangul, s);

		if (!leaf)

			return -1;



		leaf_age = utf8agetab[LEAF_GEN(leaf)];

		if (leaf_age <= data->maxage && leaf_age > age)

			age = leaf_age;

		s += utf8clen(s);

	}

	return age;

}

EXPORT_SYMBOL(utf8agemax);



/*

 * Minimum age of any character in s.

 * Return -1 if s is not valid UTF-8 unicode.

 * Return 0 if non-assigned code points are used.

 */

int utf8agemin(const struct utf8data *data, const char *s)

{

	utf8leaf_t	*leaf;

	int		age;

	int		leaf_age;

	unsigned char	hangul[UTF8HANGULLEAF];



	if (!data)

		return -1;

	age = data->maxage;

	while (*s) {

		leaf = utf8lookup(data, hangul, s);

		if (!leaf)

			return -1;

		leaf_age = utf8agetab[LEAF_GEN(leaf)];

		if (leaf_age <= data->maxage && leaf_age < age)

			age = leaf_age;

		s += utf8clen(s);

	}

	return age;

}

EXPORT_SYMBOL(utf8agemin);



/*

 * Maximum age of any character in s, touch at most len bytes.

 * Return -1 if s is not valid UTF-8 unicode.

 */

int utf8nagemax(const struct utf8data *data, const char *s, size_t len)

{

	utf8leaf_t	*leaf;

	int		age = 0;

	int		leaf_age;

	unsigned char	hangul[UTF8HANGULLEAF];



	if (!data)

		return -1;



	while (len && *s) {

		leaf = utf8nlookup(data, hangul, s, len);

		if (!leaf)

			return -1;

		leaf_age = utf8agetab[LEAF_GEN(leaf)];

		if (leaf_age <= data->maxage && leaf_age > age)

			age = leaf_age;

		len -= utf8clen(s);

		s += utf8clen(s);

	}

	return age;

}

EXPORT_SYMBOL(utf8nagemax);



/*

 * Maximum age of any character in s, touch at most len bytes.

 * Return -1 if s is not valid UTF-8 unicode.

 */

int utf8nagemin(const struct utf8data *data, const char *s, size_t len)

{

	utf8leaf_t	*leaf;

	int		leaf_age;

	int		age;

	unsigned char	hangul[UTF8HANGULLEAF];



	if (!data)

		return -1;

	age = data->maxage;

	while (len && *s) {

		leaf = utf8nlookup(data, hangul, s, len);

		if (!leaf)

			return -1;

		leaf_age = utf8agetab[LEAF_GEN(leaf)];

		if (leaf_age <= data->maxage && leaf_age < age)

			age = leaf_age;

		len -= utf8clen(s);

		s += utf8clen(s);

	}

	return age;

}

EXPORT_SYMBOL(utf8nagemin);



/*

 * Length of the normalization of s.

 * Return -1 if s is not valid UTF-8 unicode.

fs/unicode/utf8n.h

+0 −16
Original line number Diff line number Diff line
@@ -33,22 +33,6 @@ int utf8version_is_supported(unsigned int version); 
extern const struct utf8data *utf8nfdi(unsigned int maxage);

extern const struct utf8data *utf8nfdicf(unsigned int maxage);



/*

 * Determine the maximum age of any unicode character in the string.

 * Returns 0 if only unassigned code points are present.

 * Returns -1 if the input is not valid UTF-8.

 */

extern int utf8agemax(const struct utf8data *data, const char *s);

extern int utf8nagemax(const struct utf8data *data, const char *s, size_t len);



/*

 * Determine the minimum age of any unicode character in the string.

 * Returns 0 if any unassigned code points are present.

 * Returns -1 if the input is not valid UTF-8.

 */

extern int utf8agemin(const struct utf8data *data, const char *s);

extern int utf8nagemin(const struct utf8data *data, const char *s, size_t len);



/*

 * Determine the length of the normalized from of the string,

 * excluding any terminating NULL byte.