diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-11-30 21:21:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-30 21:21:36 -0500 |
| commit | 8ae7dabc10804bb1cceb2df06085b06d20c79bed (patch) | |
| tree | 1bc3f78a54311eda664cd37405eec2dbe151f8c7 /src | |
| parent | 7229afcd60b6a3ad2f0b58ca270f11936f4a7d1b (diff) | |
| parent | ee99f34438ad9a1df62b179d7e3d9ad1439b510d (diff) | |
| download | rneovim-8ae7dabc10804bb1cceb2df06085b06d20c79bed.tar.gz rneovim-8ae7dabc10804bb1cceb2df06085b06d20c79bed.tar.bz2 rneovim-8ae7dabc10804bb1cceb2df06085b06d20c79bed.zip | |
Merge pull request #16381 from VVKot/vim-8.1.0228
vim-patch:8.1.0228, 8.1.1384, 8.1.1386, 8.1.1393, 8.2.3040
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/change.c | 2 | ||||
| -rw-r--r-- | src/nvim/fileio.c | 4 | ||||
| -rw-r--r-- | src/nvim/sign.c | 2 | ||||
| -rw-r--r-- | src/nvim/syntax.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/change.c b/src/nvim/change.c index c52d992fbe..ef771125f1 100644 --- a/src/nvim/change.c +++ b/src/nvim/change.c @@ -625,7 +625,7 @@ void ins_char_bytes(char_u *buf, size_t charlen) } } - char_u *newp = xmalloc((size_t)(linelen + newlen - oldlen)); + char_u *newp = xmalloc(linelen + newlen - oldlen); // Copy bytes before the cursor. if (col > 0) { diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 1b39a7410a..c90115d796 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -100,8 +100,8 @@ struct bw_info { char_u bw_rest[CONV_RESTLEN]; // not converted bytes int bw_restlen; // nr of bytes in bw_rest[] int bw_first; // first write call - char_u *bw_conv_buf; // buffer for writing converted chars - int bw_conv_buflen; // size of bw_conv_buf + char_u *bw_conv_buf; // buffer for writing converted chars + size_t bw_conv_buflen; // size of bw_conv_buf int bw_conv_error; // set for conversion error linenr_T bw_conv_error_lnum; // first line with error or zero linenr_T bw_start_lnum; // line number at start of buffer diff --git a/src/nvim/sign.c b/src/nvim/sign.c index d8eea7f942..fca73dc9f2 100644 --- a/src/nvim/sign.c +++ b/src/nvim/sign.c @@ -80,7 +80,7 @@ static signgroup_T *sign_group_ref(const char_u *groupname) hi = hash_lookup(&sg_table, (char *)groupname, STRLEN(groupname), hash); if (HASHITEM_EMPTY(hi)) { // new group - group = xmalloc((unsigned)(sizeof(signgroup_T) + STRLEN(groupname))); + group = xmalloc(sizeof(signgroup_T) + STRLEN(groupname)); STRCPY(group->sg_name, groupname); group->sg_refcount = 1; diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index dd3f1b4dc9..49f8bbab37 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -5401,7 +5401,7 @@ static int get_id_list(char_u **const arg, const int keylen, int16_t **const lis do { for (end = p; *end && !ascii_iswhite(*end) && *end != ','; end++) { } - char_u *const name = xmalloc((int)(end - p + 3)); // leave room for "^$" + char_u *const name = xmalloc(end - p + 3); // leave room for "^$" STRLCPY(name + 1, p, end - p + 1); if (STRCMP(name + 1, "ALLBUT") == 0 || STRCMP(name + 1, "ALL") == 0 |