summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBeat Bolli <dev+git@drbeat.li>2019-10-11 20:41:23 +0200
committerJunio C Hamano <gitster@pobox.com>2019-10-12 10:57:39 +0900
commitfa364ad790ae0a778ba14b5e5fc9fe910ab4b67e (patch)
tree78a36c310602624b8061a85d9651e22f54c27ed9
parentGit 2.23 (diff)
downloadgit-fa364ad790ae0a778ba14b5e5fc9fe910ab4b67e.tar.xz
git-fa364ad790ae0a778ba14b5e5fc9fe910ab4b67e.zip
utf8: use ARRAY_SIZE() in git_wcwidth()
This macro has been available globally since b4f2a6ac92 ("Use #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))", 2006-03-09), so let's use it. Signed-off-by: Beat Bolli <dev+git@drbeat.li> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--utf8.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/utf8.c b/utf8.c
index 3b42fadffd7..5c8f151f755 100644
--- a/utf8.c
+++ b/utf8.c
@@ -95,13 +95,11 @@ static int git_wcwidth(ucs_char_t ch)
return -1;
/* binary search in table of non-spacing characters */
- if (bisearch(ch, zero_width, sizeof(zero_width)
- / sizeof(struct interval) - 1))
+ if (bisearch(ch, zero_width, ARRAY_SIZE(zero_width) - 1))
return 0;
/* binary search in table of double width characters */
- if (bisearch(ch, double_width, sizeof(double_width)
- / sizeof(struct interval) - 1))
+ if (bisearch(ch, double_width, ARRAY_SIZE(double_width) - 1))
return 2;
return 1;