diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-04-26 22:11:38 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-04-26 22:11:38 +0100 |
| commit | fc78a0369e0d371a1a85d07045ff25d8695e8f8c (patch) | |
| tree | 8b413f4e93be00cdf0b9739b8932222d1be152ca | |
| parent | 2c8a7ebdad9da017bfb6dc8a0f46acea77ec2e17 (diff) | |
| download | vim-git-fc78a0369e0d371a1a85d07045ff25d8695e8f8c.tar.gz | |
patch 8.2.4832: passing zero instead of NULL to a pointer argumentv8.2.4832
Problem: Passing zero instead of NULL to a pointer argument.
Solution: Use NULL. (closes #10296)
| -rw-r--r-- | src/getchar.c | 4 | ||||
| -rw-r--r-- | src/term.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/getchar.c b/src/getchar.c index 4caa89eb3..e208dd1a1 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -2401,14 +2401,14 @@ check_simplify_modifier(int max_offset) if (modifier == 0) { if (put_string_in_typebuf(offset, 4, new_string, len, - NULL, 0, 0) == FAIL) + NULL, 0, NULL) == FAIL) return -1; } else { tp[2] = modifier; if (put_string_in_typebuf(offset + 3, 1, new_string, len, - NULL, 0, 0) == FAIL) + NULL, 0, NULL) == FAIL) return -1; } return len; diff --git a/src/term.c b/src/term.c index 0f80e9c40..14cee6ac2 100644 --- a/src/term.c +++ b/src/term.c @@ -4505,7 +4505,9 @@ is_mouse_topline(win_T *wp) #endif /* - * Put "string[new_slen]" in typebuf, or in "buf[bufsize]" if "buf" is not NULL. + * If "buf" is NULL put "string[new_slen]" in typebuf; "buflen" is not used. + * If "buf" is not NULL put "string[new_slen]" in "buf[bufsize]" and adjust + * "buflen". * Remove "slen" bytes. * Returns FAIL for error. */ @@ -4691,7 +4693,7 @@ handle_version_response(int first, int *arg, int argc, char_u *tp) if (version > 20000) version = 0; - // Figure out more if the reeponse is CSI > 99 ; 99 ; 99 c + // Figure out more if the response is CSI > 99 ; 99 ; 99 c if (first == '>' && argc == 3) { int need_flush = FALSE; @@ -4836,7 +4838,7 @@ handle_version_response(int first, int *arg, int argc, char_u *tp) if (*T_8U != NUL && write_t_8u_state == MAYBE) // Did skip writing t_8u, a complete redraw is needed. redraw_later_clear(); - write_t_8u_state = OK; // can otuput t_8u now + write_t_8u_state = OK; // can output t_8u now // Only set 'ttymouse' automatically if it was not set // by the user already. diff --git a/src/version.c b/src/version.c index ba2753279..115989cac 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4832, +/**/ 4831, /**/ 4830, |