oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

wind: Use portable integer types

Browse Source 
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
This commit is contained in:
Joseph Sutton
2023-08-14 13:59:50 +12:00
committed by Nico Williams
parent db70a76074
commit 821fac3648
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/wind/utf8.c
View File

@@ -38,11 +38,11 @@ static int
utf8toutf32(const unsigned char **pp, uint32_t *out) utf8toutf32(const unsigned char **pp, uint32_t *out)
{ {
const unsigned char *p = *pp; const unsigned char *p = *pp;
unsigned c = *p; uint32_t c = *p;
if (c & 0x80) { if (c & 0x80) {
if ((c & 0xE0) == 0xC0) { if ((c & 0xE0) == 0xC0) {
const unsigned c2 = *++p; const uint32_t c2 = *++p;
if ((c2 & 0xC0) == 0x80) { if ((c2 & 0xC0) == 0x80) {
*out = ((c & 0x1F) << 6) *out = ((c & 0x1F) << 6)
| (c2 & 0x3F); | (c2 & 0x3F);
@@ -50,9 +50,9 @@ utf8toutf32(const unsigned char **pp, uint32_t *out)
return WIND_ERR_INVALID_UTF8; return WIND_ERR_INVALID_UTF8;
} }
} else if ((c & 0xF0) == 0xE0) { } else if ((c & 0xF0) == 0xE0) {
const unsigned c2 = *++p; const uint32_t c2 = *++p;
if ((c2 & 0xC0) == 0x80) { if ((c2 & 0xC0) == 0x80) {
const unsigned c3 = *++p; const uint32_t c3 = *++p;
if ((c3 & 0xC0) == 0x80) { if ((c3 & 0xC0) == 0x80) {
*out = ((c & 0x0F) << 12) *out = ((c & 0x0F) << 12)
| ((c2 & 0x3F) << 6) | ((c2 & 0x3F) << 6)
@@ -64,11 +64,11 @@ utf8toutf32(const unsigned char **pp, uint32_t *out)
return WIND_ERR_INVALID_UTF8; return WIND_ERR_INVALID_UTF8;
} }
} else if ((c & 0xF8) == 0xF0) { } else if ((c & 0xF8) == 0xF0) {
const unsigned c2 = *++p; const uint32_t c2 = *++p;
if ((c2 & 0xC0) == 0x80) { if ((c2 & 0xC0) == 0x80) {
const unsigned c3 = *++p; const uint32_t c3 = *++p;
if ((c3 & 0xC0) == 0x80) { if ((c3 & 0xC0) == 0x80) {
const unsigned c4 = *++p; const uint32_t c4 = *++p;
if ((c4 & 0xC0) == 0x80) { if ((c4 & 0xC0) == 0x80) {
*out = ((c & 0x07) << 18) *out = ((c & 0x07) << 18)
| ((c2 & 0x3F) << 12) | ((c2 & 0x3F) << 12)