changeset 10692:d9aeddd9086b v8.0.0236

patch 8.0.0236: gcc complains about uninitialized variable commit https://github.com/vim/vim/commit/6a717f17ec6b09634be1c29e0ac4c35213f7b32d Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jan 24 20:47:50 2017 +0100 patch 8.0.0236: gcc complains about uninitialized variable Problem: Gcc complains that a variable may be used uninitialized. Confusion between variable and label name. (John Marriott) Solution: Initialize it. Rename end to end_lnum.
author Christian Brabandt <cb@256bit.org>
date Tue, 24 Jan 2017 21:00:05 +0100
parents 8a556ede8e87
children 6c1e9dc7caf1
files src/ops.c src/version.c
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/ops.c
+++ b/src/ops.c
@@ -3774,13 +3774,13 @@ do_put(
 	 */
 	if (y_type == MCHAR && y_size == 1)
 	{
-	    linenr_T end;
+	    linenr_T end_lnum = 0; /* init for gcc */
 
 	    if (VIsual_active)
 	    {
-		end = curbuf->b_visual.vi_end.lnum;
-		if (end < curbuf->b_visual.vi_start.lnum)
-		    end = curbuf->b_visual.vi_start.lnum;
+		end_lnum = curbuf->b_visual.vi_end.lnum;
+		if (end_lnum < curbuf->b_visual.vi_start.lnum)
+		    end_lnum = curbuf->b_visual.vi_start.lnum;
 	    }
 
 	    do {
@@ -3815,7 +3815,7 @@ do_put(
 		}
 		if (VIsual_active)
 		    lnum++;
-	    } while (VIsual_active && lnum <= end);
+	    } while (VIsual_active && lnum <= end_lnum);
 
 	    if (VIsual_active) /* reset lnum to the last visual line */
 		lnum--;
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    236,
+/**/
     235,
 /**/
     234,