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

syntax: refactor get_id_list()

Browse Source 
Add const to parameters and variables.
Declare and init variables on same line.
Use `sizeof(*ptr)` to calculate size for malloc().
This commit is contained in:
Jan Edmund Lazo 2018-07-28 03:17:48 -04:00
parent c18a1b9034
commit 51f939e912
1 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/nvim/syntax.c
View File

@ -5196,35 +5196,28 @@ static void syn_cmd_sync(exarg_T *eap, int syncing)
*/ */
static int static int
get_id_list( get_id_list(
char_u **arg, char_u **const arg,
int keylen, // length of keyword const int keylen, // length of keyword
int16_t **list, // where to store the resulting list, if not int16_t **const list, // where to store the resulting list, if not
// NULL, the list is silently skipped! // NULL, the list is silently skipped!
int skip const bool skip
) )
{ {
char_u *p = NULL; char_u *p = NULL;
char_u *end; char_u *end;
int round;
int count;
int total_count = 0; int total_count = 0;
short *retval = NULL; int16_t *retval = NULL;
char_u *name;
regmatch_T regmatch; regmatch_T regmatch;
int id; int id;
int failed = FALSE; bool failed = false;
/* // We parse the list twice:
* We parse the list twice: // round == 1: count the number of items, allocate the array.
* round == 1: count the number of items, allocate the array. // round == 2: fill the array with the items.
* round == 2: fill the array with the items. // In round 1 new groups may be added, causing the number of items to
* In round 1 new groups may be added, causing the number of items to // grow when a regexp is used. In that case round 1 is done once again.
* grow when a regexp is used. In that case round 1 is done once again. for (int round = 1; round <= 2; round++) {
*/ // skip "contains"
for (round = 1; round <= 2; ++round) {
/*
* skip "contains"
*/
p = skipwhite(*arg + keylen); p = skipwhite(*arg + keylen);
if (*p != '=') { if (*p != '=') {
EMSG2(_("E405: Missing equal sign: %s"), *arg); EMSG2(_("E405: Missing equal sign: %s"), *arg);
@ -5236,14 +5229,12 @@ get_id_list(
break; break;
} }
/* // parse the arguments after "contains"
* parse the arguments after "contains" int count = 0;
*/
count = 0;
do { do {
for (end = p; *end && !ascii_iswhite(*end) && *end != ','; ++end) for (end = p; *end && !ascii_iswhite(*end) && *end != ','; end++) {
; }
name = xmalloc((int)(end - p + 3)); /* leave room for "^$" */ char_u *const name = xmalloc((int)(end - p + 3)); // leave room for "^$"
STRLCPY(name + 1, p, end - p + 1); STRLCPY(name + 1, p, end - p + 1);
if ( STRCMP(name + 1, "ALLBUT") == 0 if ( STRCMP(name + 1, "ALLBUT") == 0
|| STRCMP(name + 1, "ALL") == 0 || STRCMP(name + 1, "ALL") == 0
@ -5251,7 +5242,7 @@ get_id_list(
|| STRCMP(name + 1, "CONTAINED") == 0) { || STRCMP(name + 1, "CONTAINED") == 0) {
if (TOUPPER_ASC(**arg) != 'C') { if (TOUPPER_ASC(**arg) != 'C') {
EMSG2(_("E407: %s not allowed here"), name + 1); EMSG2(_("E407: %s not allowed here"), name + 1);
failed = TRUE; failed = true;
xfree(name); xfree(name);
break; break;
} }
@ -5287,7 +5278,7 @@ get_id_list(
STRCAT(name, "$"); STRCAT(name, "$");
regmatch.regprog = vim_regcomp(name, RE_MAGIC); regmatch.regprog = vim_regcomp(name, RE_MAGIC);
if (regmatch.regprog == NULL) { if (regmatch.regprog == NULL) {
failed = TRUE; failed = true;
xfree(name); xfree(name);
break; break;
} }
@ -5318,7 +5309,7 @@ get_id_list(
xfree(name); xfree(name);
if (id == 0) { if (id == 0) {
EMSG2(_("E409: Unknown group name: %s"), p); EMSG2(_("E409: Unknown group name: %s"), p);
failed = TRUE; failed = true;
break; break;
} }
if (id > 0) { if (id > 0) {
@ -5341,8 +5332,8 @@ get_id_list(
if (failed) if (failed)
break; break;
if (round == 1) { if (round == 1) {
retval = xmalloc((count + 1) * sizeof(short)); retval = xmalloc((count + 1) * sizeof(*retval));
retval[count] = 0; /* zero means end of the list */ retval[count] = 0; // zero means end of the list
total_count = count; total_count = count;
} }
} }