X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Futf8.h;h=c087995930eb0a75f2c7473829d45df97f5f9ff1;hb=592fd144ae313855f48d0ca52a103013b41e5d59;hp=7a5608c9ee13c4c98276029e507f5b1721a614d8;hpb=02a36bc9a1769c744f141f127898dbe076dbfd96;p=elogind.git

diff --git a/src/shared/utf8.h b/src/shared/utf8.h
index 7a5608c9e..c08799593 100644
--- a/src/shared/utf8.h
+++ b/src/shared/utf8.h
@@ -25,16 +25,18 @@
 
 #include "macro.h"
 
-char *utf8_is_valid(const char *s) _pure_;
-char *ascii_is_valid(const char *s) _pure_;
+#define UTF8_REPLACEMENT_CHARACTER "\xef\xbf\xbd"
 
-bool utf8_is_printable(const char* str, size_t length) _pure_;
+const char *utf8_is_valid(const char *s) _pure_;
+char *ascii_is_valid(const char *s) _pure_;
+char *utf8_escape_invalid(const char *s);
 
-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_;
+_pure_ static inline bool utf8_is_printable(const char* str, size_t length) {
+        return utf8_is_printable_newline(str, length, true);
+}
 
 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);