]> git.ipfire.org Git - thirdparty/git.git/commitdiff
utf8: use ARRAY_SIZE() in git_wcwidth()
authorBeat Bolli <dev+git@drbeat.li>
Fri, 11 Oct 2019 18:41:23 +0000 (20:41 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sat, 12 Oct 2019 01:57:39 +0000 (10:57 +0900)
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>
utf8.c

diff --git a/utf8.c b/utf8.c
index 3b42fadffd7ccb89a5658fdf8d314014f299a769..5c8f151f755960abadf210fcb9101ca6c6aec45a 100644 (file)
--- 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;