summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-05-03 18:57:05 +0200
committerBram Moolenaar <Bram@vim.org>2021-05-03 18:57:05 +0200
commit551c1aed65817558ac1ece541c246ea585645807 (patch)
tree347fa3f99a9a053c0c1715778df5e7d022de4511
parent2bf6034e5caf36b319148f46ba9a12e36c3bd41d (diff)
downloadvim-git-8.2.2826.tar.gz
patch 8.2.2826: compiler warnings for int to size_t conversionv8.2.2826
Problem: Compiler warnings for int to size_t conversion. (Randall W. Morris) Solution: Add type casts.
-rw-r--r--src/map.c2
-rw-r--r--src/quickfix.c2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/map.c b/src/map.c
index 31742c13b..2e792feaa 100644
--- a/src/map.c
+++ b/src/map.c
@@ -1552,7 +1552,7 @@ check_abbr(
escaped = vim_strsave_escape_csi(tb + j);
if (escaped != NULL)
{
- newlen = STRLEN(escaped);
+ newlen = (int)STRLEN(escaped);
mch_memmove(tb + j, escaped, newlen);
j += newlen;
vim_free(escaped);
diff --git a/src/quickfix.c b/src/quickfix.c
index 270810c31..9237b4b81 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -5921,7 +5921,7 @@ vgr_match_buflines(
int found_match = FALSE;
long lnum;
colnr_T col;
- int pat_len = STRLEN(spat);
+ int pat_len = (int)STRLEN(spat);
for (lnum = 1; lnum <= buf->b_ml.ml_line_count && *tomatch > 0; ++lnum)
{
diff --git a/src/version.c b/src/version.c
index a72cd3c05..82875de78 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2826,
+/**/
2825,
/**/
2824,