IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change the signature of utf_convert() (mbyte.c) to use ARRAY_SIZE

Browse Source
This commit is contained in:
Felipe Oliveira Carvalho 2014-12-13 11:35:00 -03:00
parent 2140f8f1f0
commit 478c99c128
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/mbyte.c
View File

@ -2346,13 +2346,12 @@ static convertStruct foldCase[] =
* Return the converted equivalent of "a", which is a UCS-4 character. Use * Return the converted equivalent of "a", which is a UCS-4 character. Use
* the given conversion "table". Uses binary search on "table". * the given conversion "table". Uses binary search on "table".
*/ */
static int utf_convert(int a, convertStruct *table, int tableSize) static int utf_convert(int a, convertStruct *table, size_t n_items)
{ {
int start, mid, end; /* indices into table */ size_t start, mid, end; /* indices into table */
int entries = tableSize / sizeof(convertStruct);
start = 0; start = 0;
end = entries; end = n_items;
while (start < end) { while (start < end) {
/* need to search further */ /* need to search further */
mid = (end + start) / 2; mid = (end + start) / 2;
@ -2361,7 +2360,7 @@ static int utf_convert(int a, convertStruct *table, int tableSize)
else else
end = mid; end = mid;
} }
if (start < entries if (start < n_items
&& table[start].rangeStart <= a && table[start].rangeStart <= a
&& a <= table[start].rangeEnd && a <= table[start].rangeEnd
&& (a - table[start].rangeStart) % table[start].step == 0) && (a - table[start].rangeStart) % table[start].step == 0)
@ -2376,7 +2375,7 @@ static int utf_convert(int a, convertStruct *table, int tableSize)
*/ */
int utf_fold(int a) int utf_fold(int a)
{ {
return utf_convert(a, foldCase, (int)sizeof(foldCase)); return utf_convert(a, foldCase, ARRAY_SIZE(foldCase));
} }
static convertStruct toLower[] = static convertStruct toLower[] =
@ -2702,7 +2701,7 @@ int utf_toupper(int a)
return TOUPPER_LOC(a); return TOUPPER_LOC(a);
/* For any other characters use the above mapping table. */ /* For any other characters use the above mapping table. */
return utf_convert(a, toUpper, (int)sizeof(toUpper)); return utf_convert(a, toUpper, ARRAY_SIZE(toUpper));
} }
bool utf_islower(int a) bool utf_islower(int a)
@ -2732,7 +2731,7 @@ int utf_tolower(int a)
return TOLOWER_LOC(a); return TOLOWER_LOC(a);
/* For any other characters use the above mapping table. */ /* For any other characters use the above mapping table. */
return utf_convert(a, toLower, (int)sizeof(toLower)); return utf_convert(a, toLower, ARRAY_SIZE(toLower));
} }
bool utf_isupper(int a) bool utf_isupper(int a)