aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 8.2.3437: compiler warnings for 32/64 bit usage

Browse Source 
Problem:    Compiler warnings for 32/64 bit usage.
Solution:   Add type casts. (Mike Williams, closes #8870)
This commit is contained in:
Mike Williams
2021-09-13 22:17:38 +02:00
committed by Bram Moolenaar
parent a29856fcdc
commit f5785cf059
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/screen.c
View File

@@ -4855,7 +4855,7 @@ set_chars_option(win_T *wp, char_u **varp)
{ {
lcs_chars.tab1 = NUL; lcs_chars.tab1 = NUL;
lcs_chars.tab3 = NUL; lcs_chars.tab3 = NUL;
if (multispace_len) if (multispace_len > 0)
{ {
lcs_chars.multispace = ALLOC_MULT(int, multispace_len + 1); lcs_chars.multispace = ALLOC_MULT(int, multispace_len + 1);
lcs_chars.multispace[multispace_len] = NUL; lcs_chars.multispace[multispace_len] = NUL;
@@ -4904,7 +4904,7 @@ set_chars_option(win_T *wp, char_u **varp)
if (*s == ',' || *s == NUL) if (*s == ',' || *s == NUL)
{ {
if (round) if (round > 0)
{ {
if (tab[i].cp == &lcs_chars.tab2) if (tab[i].cp == &lcs_chars.tab2)
{ {
@@ -4924,7 +4924,7 @@ set_chars_option(win_T *wp, char_u **varp)
if (i == entries) if (i == entries)
{ {
len = STRLEN("multispace"); len = (int)STRLEN("multispace");
if ((varp == &p_lcs || varp == &wp->w_p_lcs) if ((varp == &p_lcs || varp == &wp->w_p_lcs)
&& STRNCMP(p, "multispace", len) == 0 && STRNCMP(p, "multispace", len) == 0
&& p[len] == ':' && p[len] == ':'
@@ -4951,6 +4951,7 @@ set_chars_option(win_T *wp, char_u **varp)
else else
{ {
int multispace_pos = 0; int multispace_pos = 0;
while (*s != NUL && *s != ',') while (*s != NUL && *s != ',')
{ {
c1 = mb_ptr2char_adv(&s); c1 = mb_ptr2char_adv(&s);

2
src/version.c
View File

@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3437,
/**/ /**/
3436, 3436,
/**/ /**/

2
src/xdiff/xemit.c
View File

@@ -31,7 +31,7 @@ static long xdl_get_rec(xdfile_t *xdf, long ri, char const **rec) {
static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *ecb) { static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *ecb) {
long size, psize = strlen(pre); long size, psize = (long)strlen(pre);
char const *rec; char const *rec;
size = xdl_get_rec(xdf, ri, &rec); size = xdl_get_rec(xdf, ri, &rec);

2
src/xdiff/xutils.c
View File

@@ -47,7 +47,7 @@ int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize,
mb[1].size = size; mb[1].size = size;
if (size > 0 && rec[size - 1] != '\n') { if (size > 0 && rec[size - 1] != '\n') {
mb[2].ptr = (char *) "\n\\ No newline at end of file\n"; mb[2].ptr = (char *) "\n\\ No newline at end of file\n";
mb[2].size = strlen(mb[2].ptr); mb[2].size = (long)strlen(mb[2].ptr);
i++; i++;
} }
if (ecb->out_line(ecb->priv, mb, i) < 0) { if (ecb->out_line(ecb->priv, mb, i) < 0) {