From 205d15e82d9e4aa90c7980b509d3489ad8eb6c2a Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sat, 14 Nov 2015 11:45:43 +0000
Subject: All these return values from utf8_* are confusing, use an enum.

---
 input.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'input.c')

diff --git a/input.c b/input.c
index cb92e52f..f7b4e460 100644
--- a/input.c
+++ b/input.c
@@ -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,
-- 
cgit