summaryrefslogtreecommitdiff
path: root/src/basic/escape.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-11-02 11:21:25 +0100
committerLennart Poettering <lennart@poettering.net>2015-11-02 11:21:25 +0100
commitdcd12626734ce81e89c74515eaca601ef9edf785 (patch)
tree8c9b6eec38d5ee62148db6ce62d5ae1561da0b2b /src/basic/escape.c
parent6b61ae72fae00a94ebd36bee402c5a84c6aba14b (diff)
Revert "utf8.[ch]: use char32_t and char16_t instead of int, int32_t, int16_t"
Diffstat (limited to 'src/basic/escape.c')
-rw-r--r--src/basic/escape.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/basic/escape.c b/src/basic/escape.c
index 5cb8287b61..add0d7795b 100644
--- a/src/basic/escape.c
+++ b/src/basic/escape.c
@@ -226,7 +226,7 @@ int cunescape_one(const char *p, size_t length, char *ret, uint32_t *ret_unicode
int a[8];
unsigned i;
- char32_t c;
+ uint32_t c;
if (length != (size_t) -1 && length < 9)
return -EINVAL;
@@ -237,8 +237,8 @@ int cunescape_one(const char *p, size_t length, char *ret, uint32_t *ret_unicode
return a[i];
}
- c = (a[0] << 28U) | (a[1] << 24U) | (a[2] << 20U) | (a[3] << 16U) |
- (a[4] << 12U) | (a[5] << 8U) | (a[6] << 4U) | (a[7] << 0U);
+ c = ((uint32_t) a[0] << 28U) | ((uint32_t) a[1] << 24U) | ((uint32_t) a[2] << 20U) | ((uint32_t) a[3] << 16U) |
+ ((uint32_t) a[4] << 12U) | ((uint32_t) a[5] << 8U) | ((uint32_t) a[6] << 4U) | (uint32_t) a[7];
/* Don't allow 0 chars */
if (c == 0)
@@ -272,7 +272,7 @@ int cunescape_one(const char *p, size_t length, char *ret, uint32_t *ret_unicode
case '7': {
/* octal encoding */
int a, b, c;
- char32_t m;
+ uint32_t m;
if (length != (size_t) -1 && length < 3)
return -EINVAL;
@@ -294,7 +294,7 @@ int cunescape_one(const char *p, size_t length, char *ret, uint32_t *ret_unicode
return -EINVAL;
/* Don't allow bytes above 255 */
- m = (a << 6U) | (b << 3U) | (char32_t) c;
+ m = ((uint32_t) a << 6U) | ((uint32_t) b << 3U) | (uint32_t) c;
if (m > 255)
return -EINVAL;
@@ -331,7 +331,7 @@ int cunescape_length_with_prefix(const char *s, size_t length, const char *prefi
for (f = s, t = r + pl; f < s + length; f++) {
size_t remaining;
- char32_t u;
+ uint32_t u;
char c;
int k;