chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: add tests for environment serialization
[elogind.git]
/
src
/
basic
/
utf8.h
diff --git
a/src/basic/utf8.h
b/src/basic/utf8.h
index e745649f06f5b06fcbe7b0869a798f068820d403..f9b9c9468bb1581bd12668a3ad5c12afdf12b236 100644
(file)
--- a/
src/basic/utf8.h
+++ b/
src/basic/utf8.h
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
#pragma once
/***
#pragma once
/***
@@
-22,12
+20,17
@@
***/
#include <stdbool.h>
***/
#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <uchar.h>
#include "macro.h"
#include "macro.h"
+#include "missing.h"
#define UTF8_REPLACEMENT_CHARACTER "\xef\xbf\xbd"
#define UTF8_REPLACEMENT_CHARACTER "\xef\xbf\xbd"
+#define UTF8_BYTE_ORDER_MARK "\xef\xbb\xbf"
-bool unichar_is_valid(
uint
32_t c);
+bool unichar_is_valid(
char
32_t c);
const char *utf8_is_valid(const char *s) _pure_;
char *ascii_is_valid(const char *s) _pure_;
const char *utf8_is_valid(const char *s) _pure_;
char *ascii_is_valid(const char *s) _pure_;
@@
-38,20
+41,20
@@
bool utf8_is_printable_newline(const char* str, size_t length, bool newline) _pu
char *utf8_escape_invalid(const char *s);
char *utf8_escape_non_printable(const char *str);
char *utf8_escape_invalid(const char *s);
char *utf8_escape_non_printable(const char *str);
-size_t utf8_encode_unichar(char *out_utf8,
uint
32_t g);
+size_t utf8_encode_unichar(char *out_utf8,
char
32_t g);
char *utf16_to_utf8(const void *s, size_t length);
int utf8_encoded_valid_unichar(const char *str);
char *utf16_to_utf8(const void *s, size_t length);
int utf8_encoded_valid_unichar(const char *str);
-int utf8_encoded_to_unichar(const char *str);
+int utf8_encoded_to_unichar(const char *str
, char32_t *ret_unichar
);
-static inline bool utf16_is_surrogate(
uint
16_t c) {
+static inline bool utf16_is_surrogate(
char
16_t c) {
return (0xd800 <= c && c <= 0xdfff);
}
return (0xd800 <= c && c <= 0xdfff);
}
-static inline bool utf16_is_trailing_surrogate(
uint
16_t c) {
+static inline bool utf16_is_trailing_surrogate(
char
16_t c) {
return (0xdc00 <= c && c <= 0xdfff);
}
return (0xdc00 <= c && c <= 0xdfff);
}
-static inline
uint32_t utf16_surrogate_pair_to_unichar(uint16_t lead, uint
16_t trail) {
+static inline
char32_t utf16_surrogate_pair_to_unichar(char16_t lead, char
16_t trail) {
return ((lead - 0xd800) << 10) + (trail - 0xdc00) + 0x10000;
}
return ((lead - 0xd800) << 10) + (trail - 0xdc00) + 0x10000;
}