diff options
author | Lennart Poettering <lennart@poettering.net> | 2016-01-27 14:25:47 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2016-01-27 14:25:47 +0100 |
commit | 770350f41ceadd17b3b982627ed67a74a87603f4 (patch) | |
tree | d49263489849e04c14c268dd56a04f1f9aeea235 /src/basic/utf8.h | |
parent | fdb4ee00f022863ceee923b196f9c6dd536db9e2 (diff) | |
parent | c932fb71cc90461b88ecdffe47c071d001d78fb4 (diff) |
Merge pull request #2451 from zonque/pr-2162-rebased
utf8.[ch] et al: use char32_t and char16_t instead of int, int32_t, i…
Diffstat (limited to 'src/basic/utf8.h')
-rw-r--r-- | src/basic/utf8.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/basic/utf8.h b/src/basic/utf8.h index 16c4b5b55d..3e2e35b967 100644 --- a/src/basic/utf8.h +++ b/src/basic/utf8.h @@ -24,12 +24,14 @@ #include <stdbool.h> #include <stddef.h> #include <stdint.h> +#include <uchar.h> #include "macro.h" +#include "missing.h" #define UTF8_REPLACEMENT_CHARACTER "\xef\xbf\xbd" -bool unichar_is_valid(uint32_t c); +bool unichar_is_valid(char32_t c); const char *utf8_is_valid(const char *s) _pure_; char *ascii_is_valid(const char *s) _pure_; @@ -40,20 +42,20 @@ bool utf8_is_printable_newline(const char* str, size_t length, bool newline) _pu char *utf8_escape_invalid(const char *s); char *utf8_escape_non_printable(const char *str); -size_t utf8_encode_unichar(char *out_utf8, uint32_t g); +size_t utf8_encode_unichar(char *out_utf8, char32_t g); char *utf16_to_utf8(const void *s, size_t length); int utf8_encoded_valid_unichar(const char *str); -int utf8_encoded_to_unichar(const char *str); +int utf8_encoded_to_unichar(const char *str, char32_t *ret_unichar); -static inline bool utf16_is_surrogate(uint16_t c) { +static inline bool utf16_is_surrogate(char16_t c) { return (0xd800 <= c && c <= 0xdfff); } -static inline bool utf16_is_trailing_surrogate(uint16_t c) { +static inline bool utf16_is_trailing_surrogate(char16_t c) { return (0xdc00 <= c && c <= 0xdfff); } -static inline uint32_t utf16_surrogate_pair_to_unichar(uint16_t lead, uint16_t trail) { +static inline char32_t utf16_surrogate_pair_to_unichar(char16_t lead, char16_t trail) { return ((lead - 0xd800) << 10) + (trail - 0xdc00) + 0x10000; } |