diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-01-26 21:08:52 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-01-26 21:08:52 -0500 |
| commit | 6bc8c7be3a808f66d2c47bfe463a1346490da7f4 (patch) | |
| tree | 80d0fde12c759fa9e64e40fae2c2bcad13591398 /src/nvim/memline.c | |
| parent | 75a1006a20c5be7add44ed709ad34ae9fb3fce7b (diff) | |
| parent | 5deb06597ce72470a5cc86d4f52ee9b025288228 (diff) | |
| download | rneovim-6bc8c7be3a808f66d2c47bfe463a1346490da7f4.tar.gz rneovim-6bc8c7be3a808f66d2c47bfe463a1346490da7f4.tar.bz2 rneovim-6bc8c7be3a808f66d2c47bfe463a1346490da7f4.zip | |
Merge pull request #1867 from elmart/nonnull-deadcode
Remove deadcode due to nonnullret funcs.
Diffstat (limited to 'src/nvim/memline.c')
| -rw-r--r-- | src/nvim/memline.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/nvim/memline.c b/src/nvim/memline.c index 1fa6d6acc6..29b372e057 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -1240,10 +1240,8 @@ theend: mf_put(mfp, hp, false, false); mf_close(mfp, false); /* will also free(mfp->mf_fname) */ } - if (buf != NULL) { - free(buf->b_ml.ml_stack); - free(buf); - } + free(buf->b_ml.ml_stack); + free(buf); if (serious_error && called_from_main) ml_close(curbuf, TRUE); else { @@ -3279,10 +3277,7 @@ findswapname ( /* * we try different names until we find one that does not exist yet */ - if (dir_name == NULL) /* out of memory */ - fname = NULL; - else - fname = makeswapname(buf_fname, buf->b_ffname, buf, dir_name); + fname = makeswapname(buf_fname, buf->b_ffname, buf, dir_name); for (;; ) { if (fname == NULL) /* must be out of memory */ |