From: Christoph Hellwig <hch@lst.de>
To: Gabriel Krisman Bertazi <krisman@collabora.com>
Cc: linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org,
Shreeya Patel <shreeya.patel@collabora.com>,
linux-f2fs-devel@lists.sourceforge.net
Subject: [f2fs-dev] [PATCH 07/11] unicode: simplify utf8len
Date: Wed, 15 Sep 2021 09:00:02 +0200 [thread overview]
Message-ID: <20210915070006.954653-8-hch@lst.de> (raw)
In-Reply-To: <20210915070006.954653-1-hch@lst.de>
Just use the utf8nlen implementation with a (size_t)-1 len argument,
similar to utf8_lookup. Also move the function to utf8-selftest.c, as
it isn't used anywhere else.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/unicode/utf8-norm.c | 30 ------------------------------
fs/unicode/utf8-selftest.c | 5 +++++
fs/unicode/utf8n.h | 1 -
3 files changed, 5 insertions(+), 31 deletions(-)
diff --git a/fs/unicode/utf8-norm.c b/fs/unicode/utf8-norm.c
index 4b1b53391ce4b..348d6e97553f2 100644
--- a/fs/unicode/utf8-norm.c
+++ b/fs/unicode/utf8-norm.c
@@ -391,36 +391,6 @@ static utf8leaf_t *utf8lookup(const struct utf8data *data,
return utf8nlookup(data, hangul, s, (size_t)-1);
}
-/*
- * Length of the normalization of s.
- * Return -1 if s is not valid UTF-8 unicode.
- *
- * A string of Default_Ignorable_Code_Point has length 0.
- */
-ssize_t utf8len(const struct utf8data *data, const char *s)
-{
- utf8leaf_t *leaf;
- size_t ret = 0;
- unsigned char hangul[UTF8HANGULLEAF];
-
- if (!data)
- return -1;
- while (*s) {
- leaf = utf8lookup(data, hangul, s);
- if (!leaf)
- return -1;
- if (utf8agetab[LEAF_GEN(leaf)] > data->maxage)
- ret += utf8clen(s);
- else if (LEAF_CCC(leaf) == DECOMPOSE)
- ret += strlen(LEAF_STR(leaf));
- else
- ret += utf8clen(s);
- s += utf8clen(s);
- }
- return ret;
-}
-EXPORT_SYMBOL(utf8len);
-
/*
* Length of the normalization of s, touch at most len bytes.
* Return -1 if s is not valid UTF-8 unicode.
diff --git a/fs/unicode/utf8-selftest.c b/fs/unicode/utf8-selftest.c
index 37f33890e012f..80fb7c75acb28 100644
--- a/fs/unicode/utf8-selftest.c
+++ b/fs/unicode/utf8-selftest.c
@@ -160,6 +160,11 @@ static const struct {
}
};
+static ssize_t utf8len(const struct utf8data *data, const char *s)
+{
+ return utf8nlen(data, s, (size_t)-1);
+}
+
static void check_utf8_nfdi(void)
{
int i;
diff --git a/fs/unicode/utf8n.h b/fs/unicode/utf8n.h
index e4c8a767cf7a5..41182e5464dfa 100644
--- a/fs/unicode/utf8n.h
+++ b/fs/unicode/utf8n.h
@@ -39,7 +39,6 @@ extern const struct utf8data *utf8nfdicf(unsigned int maxage);
* Returns 0 if only ignorable code points are present.
* Returns -1 if the input is not valid UTF-8.
*/
-extern ssize_t utf8len(const struct utf8data *data, const char *s);
extern ssize_t utf8nlen(const struct utf8data *data, const char *s, size_t len);
/* Needed in struct utf8cursor below. */
--
2.30.2
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
next prev parent reply other threads:[~2021-09-15 7:07 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-15 6:59 [f2fs-dev] unicode cleanups, and split the data table into a separate module v2 Christoph Hellwig
2021-09-15 6:59 ` [f2fs-dev] [PATCH 01/11] ext4: simplify ext4_sb_read_encoding Christoph Hellwig
2021-09-15 6:59 ` [f2fs-dev] [PATCH 02/11] f2fs: simplify f2fs_sb_read_encoding Christoph Hellwig
2021-09-15 6:59 ` [f2fs-dev] [PATCH 03/11] unicode: remove the charset field from struct unicode_map Christoph Hellwig
2021-09-15 6:59 ` [f2fs-dev] [PATCH 04/11] unicode: mark the version field in struct unicode_map unsigned Christoph Hellwig
2021-09-15 7:00 ` [f2fs-dev] [PATCH 05/11] unicode: pass a UNICODE_AGE() tripple to utf8_load Christoph Hellwig
2021-09-15 7:00 ` [f2fs-dev] [PATCH 06/11] unicode: remove the unused utf8{, n}age{min, max} functions Christoph Hellwig
2021-09-15 7:00 ` Christoph Hellwig [this message]
2021-09-15 7:00 ` [f2fs-dev] [PATCH 08/11] unicode: move utf8cursor to utf8-selftest.c Christoph Hellwig
2021-09-15 7:00 ` [f2fs-dev] [PATCH 09/11] unicode: cache the normalization tables in struct unicode_map Christoph Hellwig
2021-09-15 7:00 ` [f2fs-dev] [PATCH 10/11] unicode: Add utf8-data module Christoph Hellwig
2021-10-12 11:25 ` Gabriel Krisman Bertazi
2021-10-12 12:49 ` Christoph Hellwig
2021-10-12 14:40 ` Gabriel Krisman Bertazi
2021-10-26 7:45 ` Christoph Hellwig
2021-10-26 13:56 ` Gabriel Krisman Bertazi
[not found] ` <20211027090208.70e88aab@canb.auug.org.au>
2021-10-28 2:00 ` [f2fs-dev] Track unicode tree in linux-next (was Re: [PATCH 10/11] unicode: Add utf8-data module) Gabriel Krisman Bertazi
2021-09-15 7:00 ` [f2fs-dev] [PATCH 11/11] unicode: only export internal symbols for the selftests Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2021-08-18 14:06 [f2fs-dev] unicode cleanups, and split the data table into a separate module Christoph Hellwig
2021-08-18 14:06 ` [f2fs-dev] [PATCH 07/11] unicode: simplify utf8len Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210915070006.954653-8-hch@lst.de \
--to=hch@lst.de \
--cc=krisman@collabora.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=shreeya.patel@collabora.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).