From 431e4a00e7792d3421c7122c32ca5df81505caf3 Mon Sep 17 00:00:00 2001 From: Lars Henriksen Date: Mon, 28 May 2018 21:07:49 +0200 Subject: Rename utf8_ord() to utf8_decode() Purely for readability and in preparation for the counterpart utf8_encode(). Signed-off-by: Lars Henriksen Signed-off-by: Lukas Fleischer --- src/calcurse.h | 2 +- src/keys.c | 2 +- src/utf8.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/calcurse.h b/src/calcurse.h index e5af531..c362055 100644 --- a/src/calcurse.h +++ b/src/calcurse.h @@ -1115,7 +1115,7 @@ int ui_todo_get_view(void); void ui_todo_set_view(int); /* utf8.c */ -int utf8_ord(const char *); +int utf8_decode(const char *); int utf8_width(char *); int utf8_strwidth(char *); int utf8_chop(char *, int); diff --git a/src/keys.c b/src/keys.c index a06858d..e609cb5 100644 --- a/src/keys.c +++ b/src/keys.c @@ -266,7 +266,7 @@ int keys_wgetch(WINDOW *win) buf[0] = ch; for (i = 1; i < UTF8_LENGTH(buf[0]); i++) buf[i] = wgetch(win); - return utf8_ord(buf) + KEY_MAX; + return utf8_decode(buf) + KEY_MAX; } void keys_wait_for_any_key(WINDOW *win) diff --git a/src/utf8.c b/src/utf8.c index e7754ae..6b04331 100644 --- a/src/utf8.c +++ b/src/utf8.c @@ -270,7 +270,7 @@ static const struct utf8_range utf8_widthtab[] = { }; /* Decode a UTF-8 encoded character. Return the Unicode code point. */ -int utf8_ord(const char *s) +int utf8_decode(const char *s) { if (UTF8_ISCONT(*s)) return -1; @@ -298,7 +298,7 @@ int utf8_width(char *s) if (UTF8_ISCONT(*s)) return 0; - val = utf8_ord(s); + val = utf8_decode(s); low = 0; high = ARRAY_SIZE(utf8_widthtab); do { -- cgit v1.2.3-70-g09d2