Subject: [PATCH] utf8: use ARRAY_SIZE() in git_wcwidth()

From: Beat Bolli <[email-masked]>
Date: Fri, 11 Oct 2019 20:24:48 +0200

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 <[email-masked]>
---
It's idle to speculate about why the macro wasn't used in the original
9e83266525 ("commit-tree: encourage UTF-8 commit messages.", 2006-12-22)
or why it hasn't been cleaned up since then. Possible reasons may be the
line wrap within the division or the fact that one sizeof() takes the
variable while the other one takes the type. Either of these would make
a normal search fail.

 utf8.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/utf8.c b/utf8.c
index 3b42fadffd..164e20c817 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;
-- 
2.21.0.1020.gf2820cf01a