diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-01-13 23:38:42 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-01-13 23:38:42 +0100 |
| commit | f9e3e09fdc93be9f0d47afbc6c7df1188c2a5a0d (patch) | |
| tree | a6b07005c19279a4f5d01be14f14861c2657fa95 /src/memfile.c | |
| parent | 05500ece6282407f9f7227aaf564e24147326863 (diff) | |
| download | vim-git-f9e3e09fdc93be9f0d47afbc6c7df1188c2a5a0d.tar.gz | |
patch 8.1.0743: giving error messages is not flexiblev8.1.0743
Problem: Giving error messages is not flexible.
Solution: Add semsg(). Change argument from "char_u *" to "char *", also
for msg() and get rid of most MSG macros. (Ozaki Kiichi, closes
#3302) Also make emsg() accept a "char *" argument. Get rid of
an enormous number of type casts.
Diffstat (limited to 'src/memfile.c')
| -rw-r--r-- | src/memfile.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/memfile.c b/src/memfile.c index 1e7390079..f2e774a4e 100644 --- a/src/memfile.c +++ b/src/memfile.c @@ -245,7 +245,7 @@ mf_close(memfile_T *mfp, int del_file) if (mfp->mf_fd >= 0) { if (close(mfp->mf_fd) < 0) - EMSG(_(e_swapclose)); + emsg(_(e_swapclose)); } if (del_file && mfp->mf_fname != NULL) mch_remove(mfp->mf_fname); @@ -291,7 +291,7 @@ mf_close_file( } if (close(mfp->mf_fd) < 0) /* close the file */ - EMSG(_(e_swapclose)); + emsg(_(e_swapclose)); mfp->mf_fd = -1; if (mfp->mf_fname != NULL) @@ -480,7 +480,7 @@ mf_put( flags = hp->bh_flags; if ((flags & BH_LOCKED) == 0) - IEMSG(_("E293: block was not locked")); + iemsg(_("E293: block was not locked")); flags &= ~BH_LOCKED; if (dirty) { @@ -1040,7 +1040,7 @@ mf_write(memfile_T *mfp, bhdr_T *hp) * space becomes available. */ if (!did_swapwrite_msg) - EMSG(_("E297: Write error in swap file")); + emsg(_("E297: Write error in swap file")); did_swapwrite_msg = TRUE; return FAIL; } @@ -1256,7 +1256,7 @@ mf_do_open( if ((flags & O_CREAT) && mch_lstat((char *)mfp->mf_fname, &sb) >= 0) { mfp->mf_fd = -1; - EMSG(_("E300: Swap file already exists (symlink attack?)")); + emsg(_("E300: Swap file already exists (symlink attack?)")); } else #endif |