patch 9.1.1225: extra NULL check in VIM_CLEAR()

Problem:  extra NULL check in VIM_CLEAR()
Solution: remove the NULL check and rely on the NULL check in vim_free()
          instead (Hirohito Higashi).

closes: #16936

Signed-off-by: Hirohito Higashi <h.east.727@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/macros.h b/src/macros.h
index 86ae33b4aa225a331a3d29537508bcc585864404..6c2931a292ae18f3a3908b7cad03cc31ae313e12 100644 (file)
--- a/src/macros.h
+++ b/src/macros.h
@@ -360,11 +360,8 @@
  */
 #define VIM_CLEAR(p) \
     do { \
-       if ((p) != NULL) \
-       { \
-           vim_free(p); \
-           (p) = NULL; \
-       } \
+       vim_free(p); \
+       (p) = NULL; \
     } while (0)
 
 /*

diff --git a/src/version.c b/src/version.c
index 02f30abf35179929f7d0d76344f14115465efb70..aab2ea5601eb46538d42eb8f52db3d7c5aabeeb3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1225,
 /**/
     1224,
 /**/