patch 8.2.0572: using two lines for free and reset

Problem:    Using two lines for free and reset.
Solution:   Use VIM_CLEAR() instead. (Yegappan Lakshmanan)

diff --git a/src/misc2.c b/src/misc2.c
index 5fc20405a56c554c14062b985d90e3ebf36d53bc..db03b5b1f9ddf9801150c6c82d2573260da47bd0 100644 (file)
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -4356,10 +4356,7 @@ build_argv_from_list(list_T *l, char ***argv, int *argc)
            int i;
 
            for (i = 0; i < *argc; ++i)
-           {
-               vim_free((*argv)[i]);
-               (*argv)[i] = NULL;
-           }
+               VIM_CLEAR((*argv)[i]);
            return FAIL;
        }
        (*argv)[*argc] = (char *)vim_strsave(s);

diff --git a/src/version.c b/src/version.c
index 40e048d6845d82bc4602e487191d7dcf04ff6e56..c5b7c8b99ad0d36ca8627ded529964e2f3e08f60 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    572,
 /**/
     571,
 /**/