summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-10-18 02:40:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-10-18 02:40:48 (GMT)
commit43400b42220f5089af45f1a883353f2b40d1c960 (patch)
tree120a995712bb771404b990e0d0eb336cd0f4350a
parent07ff6dd0ea7388ffc6cf4485928ceffe57eac1f1 (diff)
parentfa364ad790ae0a778ba14b5e5fc9fe910ab4b67e (diff)
downloadgit-43400b42220f5089af45f1a883353f2b40d1c960.zip
git-43400b42220f5089af45f1a883353f2b40d1c960.tar.gz
git-43400b42220f5089af45f1a883353f2b40d1c960.tar.bz2
Merge branch 'bb/utf8-wcwidth-cleanup'
Code cleanup. * bb/utf8-wcwidth-cleanup: utf8: use ARRAY_SIZE() in git_wcwidth()
-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;