From fa364ad790ae0a778ba14b5e5fc9fe910ab4b67e Mon Sep 17 00:00:00 2001 From: Beat Bolli Date: Fri, 11 Oct 2019 20:41:23 +0200 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- utf8.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/utf8.c b/utf8.c index 3b42fadffd..5c8f151f75 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;