pvs/V1028: cast operands, not the result

This commit is contained in:
Ihor Antonov
2019-07-15 18:49:20 -04:00
committed by Ihor Antonov
parent 31f879983f
commit dc0d021d9f

View File

@@ -15,6 +15,7 @@
#include <string.h> #include <string.h>
#include <inttypes.h> #include <inttypes.h>
#include "nvim/assert.h"
#include "nvim/vim.h" #include "nvim/vim.h"
#include "nvim/ascii.h" #include "nvim/ascii.h"
#include "nvim/getchar.h" #include "nvim/getchar.h"
@@ -912,9 +913,10 @@ int ins_typebuf(char_u *str, int noremap, int offset, int nottyped, bool silent)
memmove(s1 + newoff + offset, str, (size_t)addlen); memmove(s1 + newoff + offset, str, (size_t)addlen);
/* copy the old chars, after the insertion point, including the NUL at /* copy the old chars, after the insertion point, including the NUL at
* the end */ * the end */
int bytes = typebuf.tb_len - offset + 1;
assert(bytes > 0);
memmove(s1 + newoff + offset + addlen, memmove(s1 + newoff + offset + addlen,
typebuf.tb_buf + typebuf.tb_off + offset, typebuf.tb_buf + typebuf.tb_off + offset, (size_t)bytes);
(size_t)(typebuf.tb_len - offset + 1));
if (typebuf.tb_buf != typebuf_init) if (typebuf.tb_buf != typebuf_init)
xfree(typebuf.tb_buf); xfree(typebuf.tb_buf);
typebuf.tb_buf = s1; typebuf.tb_buf = s1;
@@ -1063,9 +1065,10 @@ void del_typebuf(int len, int offset)
typebuf.tb_off = MAXMAPLEN; typebuf.tb_off = MAXMAPLEN;
} }
/* adjust typebuf.tb_buf (include the NUL at the end) */ /* adjust typebuf.tb_buf (include the NUL at the end) */
int bytes = typebuf.tb_len - offset + 1;
assert(bytes > 0);
memmove(typebuf.tb_buf + typebuf.tb_off + offset, memmove(typebuf.tb_buf + typebuf.tb_off + offset,
typebuf.tb_buf + i + len, typebuf.tb_buf + i + len, (size_t)bytes);
(size_t)(typebuf.tb_len - offset + 1));
/* adjust typebuf.tb_noremap[] */ /* adjust typebuf.tb_noremap[] */
memmove(typebuf.tb_noremap + typebuf.tb_off + offset, memmove(typebuf.tb_noremap + typebuf.tb_off + offset,
typebuf.tb_noremap + i + len, typebuf.tb_noremap + i + len,