diff options
author | Thomas Adam <thomas@xteddy.org> | 2015-11-14 12:01:09 +0000 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2015-11-14 12:01:09 +0000 |
commit | f12d7f0d4b4a474acbdec0023156a6a647aa7763 (patch) | |
tree | 3b82cd796b067638932a9f2432b8a64ecf55f7f7 /input.c | |
parent | 7b4b78b41943082663ba75c7dcfb4e2efa86f4c7 (diff) | |
parent | 205d15e82d9e4aa90c7980b509d3489ad8eb6c2a (diff) | |
download | rtmux-f12d7f0d4b4a474acbdec0023156a6a647aa7763.tar.gz rtmux-f12d7f0d4b4a474acbdec0023156a6a647aa7763.tar.bz2 rtmux-f12d7f0d4b4a474acbdec0023156a6a647aa7763.zip |
Merge branch 'obsd-master'
Diffstat (limited to 'input.c')
-rw-r--r-- | input.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1923,7 +1923,7 @@ input_utf8_open(struct input_ctx *ictx) { struct utf8_data *ud = &ictx->utf8data; - if (!utf8_open(ud, ictx->ch)) + if (utf8_open(ud, ictx->ch) != UTF8_MORE) log_fatalx("UTF-8 open invalid %#hhx", ictx->ch); log_debug("%s %hhu", __func__, ud->size); @@ -1937,7 +1937,7 @@ input_utf8_add(struct input_ctx *ictx) { struct utf8_data *ud = &ictx->utf8data; - if (utf8_append(ud, ictx->ch) != 1) + if (utf8_append(ud, ictx->ch) != UTF8_MORE) log_fatalx("UTF-8 add invalid %#hhx", ictx->ch); log_debug("%s", __func__); @@ -1951,7 +1951,7 @@ input_utf8_close(struct input_ctx *ictx) { struct utf8_data *ud = &ictx->utf8data; - if (utf8_append(ud, ictx->ch) != 0) + if (utf8_append(ud, ictx->ch) != UTF8_DONE) log_fatalx("UTF-8 close invalid %#hhx", ictx->ch); log_debug("%s %hhu '%*s' (width %hhu)", __func__, ud->size, |