aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/getchar.c
diff options
context:
space:
mode:
authorIhor Antonov <ngortheone@gmail.com>2019-07-15 18:49:20 -0400
committerIhor Antonov <ngortheone@users.noreply.github.com>2019-07-15 19:59:41 -0400
commitdc0d021d9fbe5180f6ea7089ad192f4aa9668da3 (patch)
treececc09b2b7b62acdeb52eb09d69b5663d8341cbf /src/nvim/getchar.c
parent31f879983f5effb94a8d62c3073576511131bf6e (diff)
downloadrneovim-dc0d021d9fbe5180f6ea7089ad192f4aa9668da3.tar.gz
rneovim-dc0d021d9fbe5180f6ea7089ad192f4aa9668da3.tar.bz2
rneovim-dc0d021d9fbe5180f6ea7089ad192f4aa9668da3.zip
pvs/V1028: cast operands, not the result
Diffstat (limited to 'src/nvim/getchar.c')
-rw-r--r--src/nvim/getchar.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index 7efae1e637..9a3a996635 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -15,6 +15,7 @@
#include <string.h>
#include <inttypes.h>
+#include "nvim/assert.h"
#include "nvim/vim.h"
#include "nvim/ascii.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);
/* copy the old chars, after the insertion point, including the NUL at
* the end */
+ int bytes = typebuf.tb_len - offset + 1;
+ assert(bytes > 0);
memmove(s1 + newoff + offset + addlen,
- typebuf.tb_buf + typebuf.tb_off + offset,
- (size_t)(typebuf.tb_len - offset + 1));
+ typebuf.tb_buf + typebuf.tb_off + offset, (size_t)bytes);
if (typebuf.tb_buf != typebuf_init)
xfree(typebuf.tb_buf);
typebuf.tb_buf = s1;
@@ -1063,9 +1065,10 @@ void del_typebuf(int len, int offset)
typebuf.tb_off = MAXMAPLEN;
}
/* 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,
- typebuf.tb_buf + i + len,
- (size_t)(typebuf.tb_len - offset + 1));
+ typebuf.tb_buf + i + len, (size_t)bytes);
/* adjust typebuf.tb_noremap[] */
memmove(typebuf.tb_noremap + typebuf.tb_off + offset,
typebuf.tb_noremap + i + len,