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 intable() (mbyte.c) to use ARRAY_SIZE

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

14
src/nvim/mbyte.c
View File

@ -925,9 +925,9 @@ static int dbcs_ptr2len_len(const char_u *p, int size)
} }
/* /*
* Return true if "c" is in "table[size / sizeof(struct interval)]". * Return true if "c" is in "table".
*/ */
static bool intable(const struct interval *table, size_t size, int c) static bool intable(const struct interval *table, size_t n_items, int c)
{ {
int mid, bot, top; int mid, bot, top;
@ -937,7 +937,7 @@ static bool intable(const struct interval *table, size_t size, int c)
/* binary search in table */ /* binary search in table */
bot = 0; bot = 0;
top = (int)(size / sizeof(struct interval) - 1); top = (int)(n_items - 1);
while (top >= bot) { while (top >= bot) {
mid = (bot + top) / 2; mid = (bot + top) / 2;
if (table[mid].last < c) if (table[mid].last < c)
@ -1204,7 +1204,7 @@ int utf_char2cells(int c)
#else #else
if (!utf_printable(c)) if (!utf_printable(c))
return 6; /* unprintable, displays <xxxx> */ return 6; /* unprintable, displays <xxxx> */
if (intable(doublewidth, sizeof(doublewidth), c)) if (intable(doublewidth, ARRAY_SIZE(doublewidth), c))
return 2; return 2;
#endif #endif
} }
@ -1212,7 +1212,7 @@ int utf_char2cells(int c)
else if (c >= 0x80 && !vim_isprintc(c)) else if (c >= 0x80 && !vim_isprintc(c))
return 4; /* unprintable, displays <xx> */ return 4; /* unprintable, displays <xx> */
if (c >= 0x80 && *p_ambw == 'd' && intable(ambiguous, sizeof(ambiguous), c)) if (c >= 0x80 && *p_ambw == 'd' && intable(ambiguous, ARRAY_SIZE(ambiguous), c))
return 2; return 2;
return 1; return 1;
@ -2026,7 +2026,7 @@ bool utf_iscomposing(int c)
{0xe0100, 0xe01ef} {0xe0100, 0xe01ef}
}; };
return intable(combining, sizeof(combining), c); return intable(combining, ARRAY_SIZE(combining), c);
} }
/* /*
@ -2050,7 +2050,7 @@ bool utf_printable(int c)
{0xfffe, 0xffff} {0xfffe, 0xffff}
}; };
return !intable(nonprint, sizeof(nonprint), c); return !intable(nonprint, ARRAY_SIZE(nonprint), c);
#endif #endif
} }