X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Futf8.h;h=dcf8588d32aaa7b8a68fab9694f9be2249ebb152;hp=22e13461de5f5aab15110b5c43dacd21e38caa15;hb=43343ee7c298dad8db0698b4c181a42ecb7bb216;hpb=7991ac34ab08421415b907e42775c5539a4a5bbb

diff --git a/src/shared/utf8.h b/src/shared/utf8.h
index 22e13461d..dcf8588d3 100644
--- a/src/shared/utf8.h
+++ b/src/shared/utf8.h
@@ -25,15 +25,19 @@
 
 #include "macro.h"
 
+#define UTF8_REPLACEMENT_CHARACTER "\xef\xbf\xbd"
+
 const char *utf8_is_valid(const char *s) _pure_;
 char *ascii_is_valid(const char *s) _pure_;
 
-bool utf8_is_printable(const char* str, size_t length) _pure_;
+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 *ascii_filter(const char *s);
+char *utf8_escape_invalid(const char *s);
+char *utf8_escape_non_printable(const char *str);
 
+int utf8_encode_unichar(uint16_t c, char *p);
 char *utf16_to_utf8(const void *s, size_t length);
 
 int utf8_encoded_valid_unichar(const char *str);
-int is_utf8_encoding_whitelisted(char c, const char *white);
-int udev_encode_string(const char *str, char *str_enc, size_t len);
+int utf8_encoded_to_unichar(const char *str);