shared/utf8: merge implementations, remove cruft

[elogind.git] / src / shared / utf8.h

diff --git a/src/shared/utf8.h b/src/shared/utf8.h
index f805ea6b590608a988aa85fe4307577f53b6176e..22e13461de5f5aab15110b5c43dacd21e38caa15 100644 (file)
--- a/src/shared/utf8.h
+++ b/src/shared/utf8.h
@@ -25,12 +25,15 @@
 
 #include "macro.h"
 
 
 #include "macro.h"
 

-char *utf8_is_valid(const char *s) _pure_;
+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_;
 
 char *ascii_is_valid(const char *s) _pure_;
 
 bool utf8_is_printable(const char* str, size_t length) _pure_;
 

-char *utf8_filter(const char *s);

 char *ascii_filter(const char *s);
 
 char *utf16_to_utf8(const void *s, size_t length);
 char *ascii_filter(const char *s);
 
 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);