mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-26 13:08:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ZyX
2018-04-22 20:08:49 +03:00
parent 5ba267722c
commit 2a951d16a4
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/nvim/syntax.c
View File

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