kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-25 05:35:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

mf_open(): never fails (except for OOM)

Browse Source
This commit is contained in:
Justin M. Keyes 2018-05-17 08:16:58 +02:00
parent c2d1684e05
commit d2944e6a29
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/memfile.c
View File

@ -76,8 +76,7 @@
/// @param flags Flags for open() call.
///
/// @return - The open memory file, on success.
/// - NULL, on failure.
/// @return The open memory file.
memfile_T *mf_open(char_u *fname, int flags)
{
memfile_T *mfp = xmalloc(sizeof(memfile_T));

18
src/nvim/memline.c
View File

@ -246,7 +246,6 @@ typedef enum {
*/
int ml_open(buf_T *buf)
{
memfile_T *mfp;
bhdr_T *hp = NULL;
ZERO_BL *b0p;
PTR_BL *pp;
@ -275,12 +274,8 @@ int ml_open(buf_T *buf)
buf->b_may_swap = false;
}
/*
* Open the memfile. No swap file is created yet.
*/
mfp = mf_open(NULL, 0);
if (mfp == NULL)
goto error;
// Open the memfile. No swap file is created yet.
memfile_T *mfp = mf_open(NULL, 0);
buf->b_ml.ml_mfp = mfp;
buf->b_ml.ml_flags = ML_EMPTY;
@ -364,11 +359,10 @@ int ml_open(buf_T *buf)
return OK;
error:
if (mfp != NULL) {
if (hp)
mf_put(mfp, hp, false, false);
mf_close(mfp, true); /* will also xfree(mfp->mf_fname) */
if (hp) {
mf_put(mfp, hp, false, false);
}
mf_close(mfp, true); // will also xfree(mfp->mf_fname)
buf->b_ml.ml_mfp = NULL;
return FAIL;
}
@ -842,7 +836,7 @@ void ml_recover(void)
mf_open() will consume "fname_used"! */
mfp = mf_open(fname_used, O_RDONLY);
fname_used = p;
if (mfp == NULL || mfp->mf_fd < 0) {
if (mfp->mf_fd < 0) {
EMSG2(_("E306: Cannot open %s"), fname_used);
goto theend;
}

2
src/nvim/spell.c
View File

@ -2488,7 +2488,7 @@ buf_T *open_spellbuf(void)
buf->b_spell = true;
buf->b_p_swf = true; // may create a swap file
if (ml_open(buf) == FAIL) {
ELOG("Error opening a new memline");
abort();
}
ml_open_file(buf); // create swap file now