changeset 2690:3ea3dcbf2cd6 v7.3.108

updated for version 7.3.108 Problem: Useless check for NULL when calling vim_free(). Solution: Remove the check. (Dominique Pelle)
author Bram Moolenaar <bram@vim.org>
date Tue, 01 Feb 2011 13:48:53 +0100
parents 26fb122355d4
children 0887e8a13e5f
files src/eval.c src/ex_cmds.c src/os_win32.c src/version.c
diffstat 4 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/eval.c
+++ b/src/eval.c
@@ -5106,9 +5106,7 @@ eval7(arg, rettv, evaluate, want_string)
 	    else
 		ret = OK;
 	}
-
-	if (alias != NULL)
-	    vim_free(alias);
+	vim_free(alias);
     }
 
     *arg = skipwhite(*arg);
@@ -19807,7 +19805,7 @@ set_var(name, tv, copy)
 	    EMSG2(_("E704: Funcref variable name must start with a capital: %s"), name);
 	    return;
 	}
-	/* Don't allow hiding a function.  When "v" is not NULL we migth be
+	/* Don't allow hiding a function.  When "v" is not NULL we might be
 	 * assigning another function to the same var, the type is checked
 	 * below. */
 	if (v == NULL && function_exists(name))
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -5412,7 +5412,7 @@ read_viminfo_sub_string(virp, force)
     vir_T	*virp;
     int		force;
 {
-    if (old_sub != NULL && force)
+    if (force)
 	vim_free(old_sub);
     if (force || old_sub == NULL)
 	old_sub = viminfo_readstring(virp, 1, TRUE);
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -1886,8 +1886,7 @@ SaveConsoleBuffer(
 	cb->BufferSize.X = cb->Info.dwSize.X;
 	cb->BufferSize.Y = cb->Info.dwSize.Y;
 	NumCells = cb->BufferSize.X * cb->BufferSize.Y;
-	if (cb->Buffer != NULL)
-	    vim_free(cb->Buffer);
+	vim_free(cb->Buffer);
 	cb->Buffer = (PCHAR_INFO)alloc(NumCells * sizeof(CHAR_INFO));
 	if (cb->Buffer == NULL)
 	    return FALSE;
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    108,
+/**/
     107,
 /**/
     106,