diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-11-10 20:05:42 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-11-10 20:05:42 -0500 |
| commit | fc19f0c4c6773ff8b10c14492da2acf3601d8cbc (patch) | |
| tree | 68ecc9a6718caf0cdb1bca365ce6373944af1357 /src/nvim/fileio.c | |
| parent | 3080672650b1a6583684edfdafef7e07c0c7cf56 (diff) | |
| parent | a6548e4fb34d50fbd49d0878618c3aecefabe79b (diff) | |
| download | rneovim-fc19f0c4c6773ff8b10c14492da2acf3601d8cbc.tar.gz rneovim-fc19f0c4c6773ff8b10c14492da2acf3601d8cbc.tar.bz2 rneovim-fc19f0c4c6773ff8b10c14492da2acf3601d8cbc.zip | |
Merge pull request #1431 from elmart/clang-analysis-fixes-2
Fix clang analysis warnings. (2)
Diffstat (limited to 'src/nvim/fileio.c')
| -rw-r--r-- | src/nvim/fileio.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index ecc05a9faa..05a0a59874 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -1751,7 +1751,9 @@ failed: # ifdef USE_ICONV if (iconv_fd != (iconv_t)-1) { iconv_close(iconv_fd); +# ifndef __clang_analyzer__ iconv_fd = (iconv_t)-1; +# endif } # endif @@ -6189,12 +6191,9 @@ aucmd_prepbuf ( } } - /* Allocate "aucmd_win" when needed. If this fails (out of memory) fall - * back to using the current window. */ + /* Allocate "aucmd_win" when needed. */ if (win == NULL && aucmd_win == NULL) { win_alloc_aucmd_win(); - if (aucmd_win == NULL) - win = curwin; } if (win == NULL && aucmd_win_used) /* Strange recursive autocommand, fall back to using the current |