0
0
mirror of https://github.com/vim/vim.git synced 2025-10-05 05:34:07 -04:00

patch 8.1.0743: giving error messages is not flexible

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.
This commit is contained in:
Bram Moolenaar
2019-01-13 23:38:42 +01:00
parent 05500ece62
commit f9e3e09fdc
95 changed files with 1963 additions and 2018 deletions

View File

@@ -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