syntax: Silence PVS/V522: retval is always non-NULL on this round

This commit is contained in:
ZyX
2018-04-22 20:08:49 +03:00
parent 5ba267722c
commit 2a951d16a4

View File

@@ -5321,18 +5321,19 @@ get_id_list (
for (int i = highlight_ga.ga_len; --i >= 0; ) {
if (vim_regexec(&regmatch, HL_TABLE()[i].sg_name, (colnr_T)0)) {
if (round == 2) {
/* Got more items than expected; can happen
* when adding items that match:
* "contains=a.*b,axb".
* Go back to first round */
// Got more items than expected; can happen
// when adding items that match:
// "contains=a.*b,axb".
// Go back to first round.
if (count >= total_count) {
xfree(retval);
round = 1;
} else
retval[count] = i + 1;
} else {
retval[count] = i + 1; // -V522
}
++count;
id = -1; /* remember that we found one */
}
count++;
id = -1; // Remember that we found one.
}
}
vim_regfree(regmatch.regprog);
@@ -5346,13 +5347,14 @@ get_id_list (
}
if (id > 0) {
if (round == 2) {
/* Got more items than expected, go back to first round */
// Got more items than expected, go back to first round.
if (count >= total_count) {
xfree(retval);
round = 1;
} else
} else {
retval[count] = id;
}
}
++count;
}
p = skipwhite(end);