kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'bb/utf8-wcwidth-cleanup' 

Code cleanup.

* bb/utf8-wcwidth-cleanup:
  utf8: use ARRAY_SIZE() in git_wcwidth()
maint
Junio C Hamano 2019-10-18 11:40:48 +09:00
parent 07ff6dd0ea fa364ad790
commit 43400b4222
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utf8.c
View File

@ -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;