summaryrefslogtreecommitdiff
path: root/utf8.c
diff options
context:
space:
mode:
authorBeat Bolli <dev+git@drbeat.li>2019-10-11 18:41:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-10-12 01:57:39 (GMT)
commitfa364ad790ae0a778ba14b5e5fc9fe910ab4b67e (patch)
tree78a36c310602624b8061a85d9651e22f54c27ed9 /utf8.c
parent5fa0f5238b0cd46cfe7f6fa76c3f526ea98148d9 (diff)
downloadgit-fa364ad790ae0a778ba14b5e5fc9fe910ab4b67e.zip
git-fa364ad790ae0a778ba14b5e5fc9fe910ab4b67e.tar.gz
git-fa364ad790ae0a778ba14b5e5fc9fe910ab4b67e.tar.bz2
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>
Diffstat (limited to 'utf8.c')
-rw-r--r--utf8.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/utf8.c b/utf8.c
index 3b42fad..5c8f151 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;