summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-02-19 21:50:42 +0100
committerBram Moolenaar <Bram@vim.org>2018-02-19 21:50:42 +0100
commit9c8816bd306a003c2ac3dce161be3fef481c9902 (patch)
tree631395fe75f5421f39933612ad9add7fff49a3a9
parentd96ff165113ce5fe62107add590997660e3d4802 (diff)
downloadvim-git-9c8816bd306a003c2ac3dce161be3fef481c9902.tar.gz
patch 8.0.1524: compiler warnings for uninitialized variablesv8.0.1524
Problem: Compiler warnings for uninitialized variables. (Tony Mechelynck) Solution: Initialize variables.
-rw-r--r--src/terminal.c6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/terminal.c b/src/terminal.c
index bcdc70025..0f9aa8640 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -3277,9 +3277,9 @@ term_load_dump(typval_T *argvars, typval_T *rettv, int do_diff)
char_u buf1[NUMBUFLEN];
char_u buf2[NUMBUFLEN];
char_u *fname1;
- char_u *fname2;
+ char_u *fname2 = NULL;
FILE *fd1;
- FILE *fd2;
+ FILE *fd2 = NULL;
char_u *textline = NULL;
/* First open the files. If this fails bail out. */
@@ -3460,7 +3460,7 @@ term_load_dump(typval_T *argvars, typval_T *rettv, int do_diff)
theend:
vim_free(textline);
fclose(fd1);
- if (do_diff)
+ if (fd2 != NULL)
fclose(fd2);
}
diff --git a/src/version.c b/src/version.c
index 11c513391..78b8431d1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1524,
+/**/
1523,
/**/
1522,