Skip to content

Commit 88d1349

Browse files
committed
Make control flow in mb_wchar_to_cp50220 a bit clearer
1 parent 8df5155 commit 88d1349

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,6 @@ static void mb_wchar_to_cp50220(uint32_t *in, size_t len, mb_convert_buf *buf, b
10411041
MB_CONVERT_BUF_LOAD(buf, out, limit);
10421042
MB_CONVERT_BUF_ENSURE(buf, out, limit, len);
10431043

1044-
bool consumed = false;
10451044
uint32_t w;
10461045

10471046
if (buf->state & 0xFFFF00) {
@@ -1060,10 +1059,10 @@ static void mb_wchar_to_cp50220(uint32_t *in, size_t len, mb_convert_buf *buf, b
10601059
* but the 'next one' will come in a separate buffer */
10611060
buf->state |= w << 8;
10621061
break;
1063-
} else {
1064-
w = mb_convert_kana_codepoint(w, len ? *in : 0, &consumed, NULL, MBFL_HAN2ZEN_KATAKANA | MBFL_HAN2ZEN_GLUE);
10651062
}
10661063

1064+
bool consumed = false;
1065+
w = mb_convert_kana_codepoint(w, len ? *in : 0, &consumed, NULL, MBFL_HAN2ZEN_KATAKANA | MBFL_HAN2ZEN_GLUE);
10671066
if (consumed) {
10681067
/* Two successive codepoints were converted into one */
10691068
in++; len--; consumed = false;

0 commit comments

Comments
 (0)