* _St32[1] is the character accumulated so far
*/
+static bool utf8_mbsinit( const mbstate_t *p_s )
+{ return p_s->_StUC[0] == 0; }
+
enum {
DecStart = 0,
_PDCLIB_UNDEFINED(accum); \
state = DecStart; \
} while(0)
+
#define CHECK_CONTINUATION \
do { if((c & 0xC0) != 0x80) return false; } while(0)
char32_t c32;
switch(state) {
case DecStart:
- // 1 byte
+ // 1 byte
if(c <= 0x7F) {
OUT32(c);
} else if(c <= 0xDF) {
}
(*p_inbuf)++;
- (*p_insz)--;
+ (*p_insz)--;
}
END_CONVERSION;
}
{
START_CONVERSION
while(*p_outsz) {
- unsigned char outc;
+ unsigned char outc = 0;
switch(state) {
case Enc3R:
outc = 0x80 | ((accum >> 12) & 0x3F);
if(p_outbuf) {
**p_outbuf = outc;
- (*p_outbuf)++;
+ (*p_outbuf)++;
}
- (*p_outsz)--;
+ (*p_outsz)--;
}
END_CONVERSION;
}
-struct _PDCLIB_charcodec _PDCLIB_utf8_codec = {
+const struct _PDCLIB_charcodec_t _PDCLIB_utf8_codec = {
+ .__mbsinit = utf8_mbsinit,
.__mbstoc32s = utf8toc32,
.__c32stombs = c32toutf8,
+ .__mb_max = 4,
};
#endif
#ifndef REGTEST
// Valid conversion & back
- static const char* input = "abcde" "\xDF\xBF" "\xEF\xBF\xBF"
+ static const char* input = "abcde" "\xDF\xBF" "\xEF\xBF\xBF"
"\xF4\x8F\xBF\xBF";
char32_t c32out[8];
- char32_t *c32ptr = &c32out[0];
- size_t c32rem = 8;
- char *chrptr = (char*) &input[0];
- size_t chrrem = strlen(input);
- mbstate_t mbs = { 0 };
+ char32_t *c32ptr = &c32out[0];
+ size_t c32rem = 8;
+ const char *chrptr = (char*) &input[0];
+ size_t chrrem = strlen(input);
+ mbstate_t mbs = { 0 };
TESTCASE(utf8toc32(&c32ptr, &c32rem, &chrptr, &chrrem, &mbs));
TESTCASE(c32rem == 0);