patch 8.2.4832: passing zero instead of NULL to a pointer argument

Problem:    Passing zero instead of NULL to a pointer argument.
Solution:   Use NULL. (closes #10296)

diff --git a/src/getchar.c b/src/getchar.c
index 4caa89eb3f02d40ed68e2388c98d569de576024e..e208dd1a18444d2b68fd3e2a1878af2f3dab22ea 100644 (file)
--- 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 0f80e9c40bada6c8124b4615186fb58eede752bb..14cee6ac266d2f6d79a18d3864f27e08a7950bac 100644 (file)
--- 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 ba27532797bd817855417470af42169a275a6740..115989cac48efc37d1c242430528e94c2503204c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4832,
 /**/
     4831,
 /**/