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

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

Browse Source
This commit is contained in:
Ihor Antonov
2019-07-15 19:01:12 -04:00
committed by Justin M. Keyes
parent de3e2f051e
commit 046deeeaa1
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/nvim/ops.c
View File

@@ -3085,8 +3085,9 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
memset(ptr, ' ', (size_t)bd.endspaces); memset(ptr, ' ', (size_t)bd.endspaces);
ptr += bd.endspaces; ptr += bd.endspaces;
// move the text after the cursor to the end of the line. // move the text after the cursor to the end of the line.
memmove(ptr, oldp + bd.textcol + delcount, int columns = (int)oldlen - bd.textcol - delcount + 1;
(size_t)((int)oldlen - bd.textcol - delcount + 1)); assert(columns >= 0);
memmove(ptr, oldp + bd.textcol + delcount, (size_t)columns);
ml_replace(curwin->w_cursor.lnum, newp, false); ml_replace(curwin->w_cursor.lnum, newp, false);
++curwin->w_cursor.lnum; ++curwin->w_cursor.lnum;
@@ -3209,11 +3210,11 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
xfree(newp); xfree(newp);
oldp = ml_get(lnum); oldp = ml_get(lnum);
newp = (char_u *) xmalloc((size_t)(col + yanklen + 1)); newp = (char_u *)xmalloc((size_t)col + (size_t)yanklen + 1);
/* copy first part of line */ // copy first part of line
memmove(newp, oldp, (size_t)col); memmove(newp, oldp, (size_t)col);
/* append to first line */ // append to first line
memmove(newp + col, y_array[0], (size_t)(yanklen + 1)); memmove(newp + col, y_array[0], (size_t)yanklen + 1);
ml_replace(lnum, newp, false); ml_replace(lnum, newp, false);
curwin->w_cursor.lnum = lnum; curwin->w_cursor.lnum = lnum;
@@ -3705,11 +3706,11 @@ int do_join(size_t count,
} }
} }
/* store the column position before last line */ // store the column position before last line
col = sumsize - currsize - spaces[count - 1]; col = sumsize - currsize - spaces[count - 1];
/* allocate the space for the new line */ // allocate the space for the new line
newp = (char_u *) xmalloc((size_t)(sumsize + 1)); newp = (char_u *)xmalloc((size_t)sumsize + 1);
cend = newp + sumsize; cend = newp + sumsize;
*cend = 0; *cend = 0;
@@ -5472,7 +5473,7 @@ void cursor_pos_info(dict_T *dict)
byte_count_cursor = byte_count byte_count_cursor = byte_count
+ line_count_info(ml_get(lnum), &word_count_cursor, + line_count_info(ml_get(lnum), &word_count_cursor,
&char_count_cursor, &char_count_cursor,
(varnumber_T)(curwin->w_cursor.col + 1), (varnumber_T)curwin->w_cursor.col + 1,
eol_size); eol_size);
} }
} }