diff options
| author | Christoph Hellwig <hch@lst.de> | 2021-09-15 09:00:00 +0200 |
|---|---|---|
| committer | Gabriel Krisman Bertazi <krisman@collabora.com> | 2021-10-11 17:01:46 -0300 |
| commit | 49bd03cc7e95cb78420305ca2f5ef67497b6fa80 (patch) | |
| tree | 5fb64ae823accadc746d0e16dc290c8c4baa3cf8 /include/linux/unicode.h | |
| parent | f3a9c82396006a5664f6e398d6928799d29de76e (diff) | |
| download | lwn-49bd03cc7e95cb78420305ca2f5ef67497b6fa80.tar.gz lwn-49bd03cc7e95cb78420305ca2f5ef67497b6fa80.zip | |
unicode: pass a UNICODE_AGE() tripple to utf8_load
Don't bother with pointless string parsing when the caller can just pass
the version in the format that the core expects. Also remove the
fallback to the latest version that none of the callers actually uses.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
Diffstat (limited to 'include/linux/unicode.h')
| -rw-r--r-- | include/linux/unicode.h | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/include/linux/unicode.h b/include/linux/unicode.h index 0744f81c4b5f..77bb915fd1f0 100644 --- a/include/linux/unicode.h +++ b/include/linux/unicode.h @@ -5,6 +5,29 @@ #include <linux/init.h> #include <linux/dcache.h> +#define UNICODE_MAJ_SHIFT 16 +#define UNICODE_MIN_SHIFT 8 + +#define UNICODE_AGE(MAJ, MIN, REV) \ + (((unsigned int)(MAJ) << UNICODE_MAJ_SHIFT) | \ + ((unsigned int)(MIN) << UNICODE_MIN_SHIFT) | \ + ((unsigned int)(REV))) + +static inline u8 unicode_major(unsigned int age) +{ + return (age >> UNICODE_MAJ_SHIFT) & 0xff; +} + +static inline u8 unicode_minor(unsigned int age) +{ + return (age >> UNICODE_MIN_SHIFT) & 0xff; +} + +static inline u8 unicode_rev(unsigned int age) +{ + return age & 0xff; +} + struct unicode_map { unsigned int version; }; @@ -29,7 +52,7 @@ int utf8_casefold(const struct unicode_map *um, const struct qstr *str, int utf8_casefold_hash(const struct unicode_map *um, const void *salt, struct qstr *str); -struct unicode_map *utf8_load(const char *version); +struct unicode_map *utf8_load(unsigned int version); void utf8_unload(struct unicode_map *um); #endif /* _LINUX_UNICODE_H */ |