summaryrefslogtreecommitdiff
path: root/fs/unicode
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2021-09-15 09:00:03 +0200
committerGabriel Krisman Bertazi <krisman@collabora.com>2021-10-11 17:01:58 -0300
commitfbc59d65059ecfea8b746715e920c325cc16cede (patch)
treece6dbf5359d4e40ffb3fd67c5222352177b7f87f /fs/unicode
parent9012d79cf0c760eb69d54163ee5152c1b504f7aa (diff)
unicode: move utf8cursor to utf8-selftest.c
Only used by the tests, so no need to keep it in the core. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
Diffstat (limited to 'fs/unicode')
-rw-r--r--fs/unicode/utf8-norm.c16
-rw-r--r--fs/unicode/utf8-selftest.c6
-rw-r--r--fs/unicode/utf8n.h2
3 files changed, 6 insertions, 18 deletions
diff --git a/fs/unicode/utf8-norm.c b/fs/unicode/utf8-norm.c
index 348d6e97553f..1ac90fa00070 100644
--- a/fs/unicode/utf8-norm.c
+++ b/fs/unicode/utf8-norm.c
@@ -457,22 +457,6 @@ int utf8ncursor(struct utf8cursor *u8c, const struct utf8data *data,
EXPORT_SYMBOL(utf8ncursor);
/*
- * Set up an utf8cursor for use by utf8byte().
- *
- * u8c : pointer to cursor.
- * data : const struct utf8data to use for normalization.
- * s : NUL-terminated string.
- *
- * Returns -1 on error, 0 on success.
- */
-int utf8cursor(struct utf8cursor *u8c, const struct utf8data *data,
- const char *s)
-{
- return utf8ncursor(u8c, data, s, (unsigned int)-1);
-}
-EXPORT_SYMBOL(utf8cursor);
-
-/*
* Get one byte from the normalized form of the string described by u8c.
*
* Returns the byte cast to an unsigned char on succes, and -1 on failure.
diff --git a/fs/unicode/utf8-selftest.c b/fs/unicode/utf8-selftest.c
index 80fb7c75acb2..04628b50351d 100644
--- a/fs/unicode/utf8-selftest.c
+++ b/fs/unicode/utf8-selftest.c
@@ -165,6 +165,12 @@ static ssize_t utf8len(const struct utf8data *data, const char *s)
return utf8nlen(data, s, (size_t)-1);
}
+static int utf8cursor(struct utf8cursor *u8c, const struct utf8data *data,
+ const char *s)
+{
+ return utf8ncursor(u8c, data, s, (unsigned int)-1);
+}
+
static void check_utf8_nfdi(void)
{
int i;
diff --git a/fs/unicode/utf8n.h b/fs/unicode/utf8n.h
index 41182e5464df..736b6460a38c 100644
--- a/fs/unicode/utf8n.h
+++ b/fs/unicode/utf8n.h
@@ -65,8 +65,6 @@ struct utf8cursor {
* Returns 0 on success.
* Returns -1 on failure.
*/
-extern int utf8cursor(struct utf8cursor *u8c, const struct utf8data *data,
- const char *s);
extern int utf8ncursor(struct utf8cursor *u8c, const struct utf8data *data,
const char *s, size_t len);