chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shared: add formats-util.h
[elogind.git]
/
src
/
shared
/
utf8.c
diff --git
a/src/shared/utf8.c
b/src/shared/utf8.c
index 013c110f07c072426615bd3b9f226038b2605d49..800884ffee99c77b36c6c16f35015a70442409fa 100644
(file)
--- a/
src/shared/utf8.c
+++ b/
src/shared/utf8.c
@@
-52,7
+52,7
@@
#include "utf8.h"
#include "util.h"
#include "utf8.h"
#include "util.h"
-
static inline bool is_unicode
_valid(uint32_t ch) {
+
bool unichar_is
_valid(uint32_t ch) {
if (ch >= 0x110000) /* End of unicode space */
return false;
if (ch >= 0x110000) /* End of unicode space */
return false;
@@
-66,7
+66,7
@@
static inline bool is_unicode_valid(uint32_t ch) {
return true;
}
return true;
}
-static bool
is_unicode
_control(uint32_t ch) {
+static bool
unichar_is
_control(uint32_t ch) {
/*
0 to ' '-1 is the C0 range.
/*
0 to ' '-1 is the C0 range.
@@
-156,7
+156,7
@@
bool utf8_is_printable_newline(const char* str, size_t length, bool newline) {
val = utf8_encoded_to_unichar(p);
if (val < 0 ||
val = utf8_encoded_to_unichar(p);
if (val < 0 ||
-
is_unicode
_control(val) ||
+
unichar_is
_control(val) ||
(!newline && val == '\n'))
return false;
(!newline && val == '\n'))
return false;
@@
-276,6
+276,7
@@
char *ascii_is_valid(const char *str) {
* occupy.
*/
size_t utf8_encode_unichar(char *out_utf8, uint32_t g) {
* occupy.
*/
size_t utf8_encode_unichar(char *out_utf8, uint32_t g) {
+
if (g < (1 << 7)) {
if (out_utf8)
out_utf8[0] = g & 0x7f;
if (g < (1 << 7)) {
if (out_utf8)
out_utf8[0] = g & 0x7f;
@@
-301,9
+302,9
@@
size_t utf8_encode_unichar(char *out_utf8, uint32_t g) {
out_utf8[3] = 0x80 | (g & 0x3f);
}
return 4;
out_utf8[3] = 0x80 | (g & 0x3f);
}
return 4;
- } else {
- return 0;
}
}
+
+ return 0;
}
char *utf16_to_utf8(const void *s, size_t length) {
}
char *utf16_to_utf8(const void *s, size_t length) {
@@
-394,7
+395,7
@@
int utf8_encoded_valid_unichar(const char *str) {
return -EINVAL;
/* check if value has valid range */
return -EINVAL;
/* check if value has valid range */
- if (!
is_unicode
_valid(unichar))
+ if (!
unichar_is
_valid(unichar))
return -EINVAL;
return len;
return -EINVAL;
return len;