diff options
Diffstat (limited to 'lib/mbstring/u8prev.c')
| -rw-r--r-- | lib/mbstring/u8prev.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/lib/mbstring/u8prev.c b/lib/mbstring/u8prev.c index 507f7e1..ff580c2 100644 --- a/lib/mbstring/u8prev.c +++ b/lib/mbstring/u8prev.c @@ -12,23 +12,22 @@ u8prev(rune *ch, const char8_t **p, const char8_t *start) if (d <= 0) { return 0; - } else if (U8_BYTE_1(s[-1])) { + } else if (u8byte1(s[-1])) { if (ch) *ch = s[-1]; off = 1; - } else if (d > 1 && U8_BYTE_C(s[-1]) && U8_BYTE_2(s[-2])) { + } else if (d > 1 && u8bytec(s[-1]) && u8byte2(s[-2])) { if (ch) *ch = ((s[-2] & 0x1F) << 6) | (s[-1] & 0x3F); off = 2; - } else if (d > 2 && U8_BYTE_C(s[-1]) && U8_BYTE_C(s[-2]) - && U8_BYTE_3(s[-3])) { + } else if (d > 2 && u8bytec(s[-1]) && u8bytec(s[-2]) && u8byte3(s[-3])) { if (ch) { - *ch = - ((s[-3] & 0x0F) << 12) | ((s[-2] & 0x3F) << 6) | (s[-1] & 0x3F); + *ch = ((s[-3] & 0x0F) << 12) | ((s[-2] & 0x3F) << 6) + | (s[-1] & 0x3F); } off = 3; - } else if (d > 3 && U8_BYTE_C(s[-1]) && U8_BYTE_C(s[-2]) && U8_BYTE_C(s[-3]) - && U8_BYTE_4(s[-4])) { + } else if (d > 3 && u8bytec(s[-1]) && u8bytec(s[-2]) && u8bytec(s[-3]) + && u8byte4(s[-4])) { if (ch) { *ch = ((s[-4] & 0x07) << 18) | ((s[-3] & 0x3F) << 12) | ((s[-2] & 0x3F) << 6) | (s[-1] & 0x3F); |