mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 19:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

PVS/V1028: cast operands, not the result #10503

Browse Source
This commit is contained in:
Ihor Antonov
2019-07-16 13:50:01 -04:00
committed by Justin M. Keyes
parent 583c35714c
commit b9a2b3f014
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/ops.c
View File

@@ -1761,6 +1761,8 @@ int op_replace(oparg_T *oap, int c)
// insert replacement chars CHECK FOR ALLOCATED SPACE // insert replacement chars CHECK FOR ALLOCATED SPACE
// REPLACE_CR_NCHAR/REPLACE_NL_NCHAR is used for entering CR literally. // REPLACE_CR_NCHAR/REPLACE_NL_NCHAR is used for entering CR literally.
size_t after_p_len = 0; size_t after_p_len = 0;
int col = oldlen - bd.textcol - bd.textlen + 1;
assert(col >= 0);
if (had_ctrl_v_cr || (c != '\r' && c != '\n')) { if (had_ctrl_v_cr || (c != '\r' && c != '\n')) {
// strlen(newp) at this point // strlen(newp) at this point
int newp_len = bd.textcol + bd.startspaces; int newp_len = bd.textcol + bd.startspaces;
@@ -1772,12 +1774,11 @@ int op_replace(oparg_T *oap, int c)
memset(newp + newp_len, ' ', (size_t)bd.endspaces); memset(newp + newp_len, ' ', (size_t)bd.endspaces);
newp_len += bd.endspaces; newp_len += bd.endspaces;
// copy the part after the changed part // copy the part after the changed part
memmove(newp + newp_len, oldp, memmove(newp + newp_len, oldp, (size_t)col);
(size_t)(oldlen - bd.textcol - bd.textlen + 1));
} }
} else { } else {
// Replacing with \r or \n means splitting the line. // Replacing with \r or \n means splitting the line.
after_p_len = (size_t)(oldlen - bd.textcol - bd.textlen + 1); after_p_len = (size_t)col;
after_p = (char_u *)xmalloc(after_p_len); after_p = (char_u *)xmalloc(after_p_len);
memmove(after_p, oldp, after_p_len); memmove(after_p, oldp, after_p_len);
} }