patch 8.1.1376: warnings for size_t/int mixups
Problem: Warnings for size_t/int mixups.
Solution: Change types, add type casts. (Mike Williams)
diff --git a/src/textprop.c b/src/textprop.c
index 15ae494..66ad694 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1203,7 +1203,7 @@
size_t oldproplen;
char_u *props;
int i;
- int len;
+ size_t len;
char_u *line;
size_t l;
@@ -1218,8 +1218,8 @@
// get existing properties of the joined line
oldproplen = get_text_props(curbuf, lnum, &props, FALSE);
- len = (int)STRLEN(newp) + 1;
- line = alloc(len + (oldproplen + proplen) * (int)sizeof(textprop_T));
+ len = STRLEN(newp) + 1;
+ line = alloc((int)(len + (oldproplen + proplen) * sizeof(textprop_T)));
if (line == NULL)
return;
mch_memmove(line, newp, len);
@@ -1236,7 +1236,7 @@
vim_free(prop_lines[i]);
}
- ml_replace_len(lnum, line, len, TRUE, FALSE);
+ ml_replace_len(lnum, line, (colnr_T)len, TRUE, FALSE);
vim_free(newp);
vim_free(prop_lines);
vim_free(prop_lengths);