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.

diff --git a/src/ops.c b/src/ops.c
index 2aee03deff373f88a5d24ebc56cf71d99ea27b65..7d656a63136830ca439e301cfcd479558a866013 100644 (file)
--- 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--;

diff --git a/src/version.c b/src/version.c
index 65208d0a0e5c00cdc1cb9aeafba1f82287670ad0..684a244cd98e6586ad30926f6cb4dd26f82a7ab5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    236,
 /**/
     235,
 /**/