X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Futf8.h;h=59abee50ac08bc2ad26aed8fd90bea76869a606e;hb=e9e310f8e99c63c764f71ed0c224ccd3cceb90c7;hp=af2420fda42cdbabd0e3959616900377416482ff;hpb=5430f7f2bc7330f3088b894166bf3524a067e3d8;p=elogind.git diff --git a/src/shared/utf8.h b/src/shared/utf8.h index af2420fda..59abee50a 100644 --- a/src/shared/utf8.h +++ b/src/shared/utf8.h @@ -1,7 +1,6 @@ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ -#ifndef fooutf8hfoo -#define fooutf8hfoo +#pragma once /*** This file is part of systemd. @@ -22,12 +21,22 @@ along with systemd; If not, see . ***/ +#include + #include "macro.h" -char *utf8_is_valid(const char *s) _pure_; +#define UTF8_REPLACEMENT_CHARACTER "\xef\xbf\xbd" + +const char *utf8_is_valid(const char *s) _pure_; char *ascii_is_valid(const char *s) _pure_; -char *utf8_filter(const char *s); -char *ascii_filter(const char *s); +bool utf8_is_printable_newline(const char* str, size_t length, bool newline) _pure_; +#define utf8_is_printable(str, length) utf8_is_printable_newline(str, length, true) + +char *utf8_escape_invalid(const char *s); +char *utf8_escape_non_printable(const char *str); + +char *utf16_to_utf8(const void *s, size_t length); -#endif +int utf8_encoded_valid_unichar(const char *str); +int utf8_encoded_to_unichar(const char *str);