mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-19 09:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fileio: Clean up IObuff-manipulation mess

Browse Source
This commit is contained in:
ZyX
2017-04-03 01:39:09 +03:00
parent 8eb598c08e
commit 1c41b9c775
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/nvim/fileio.c
View File

@@ -2259,7 +2259,7 @@ buf_write (
linenr_T lnum; linenr_T lnum;
long nchars; long nchars;
#define SET_ERRMSG_NUM(num, msg) \ #define SET_ERRMSG_NUM(num, msg) \
errnum = num ": ", errmsg = msg, errmsgarg = 0 errnum = num, errmsg = msg, errmsgarg = 0
#define SET_ERRMSG_ARG(msg, error) \ #define SET_ERRMSG_ARG(msg, error) \
errnum = NULL, errmsg = msg, errmsgarg = error errnum = NULL, errmsg = msg, errmsgarg = error
#define SET_ERRMSG(msg) \ #define SET_ERRMSG(msg) \
@@ -3681,29 +3681,21 @@ nofail:
#endif #endif
if (errmsg != NULL) { if (errmsg != NULL) {
const size_t numlen = (errnum != NULL ? strlen(errnum) : 0);
// Put file name in IObuff with quotes.
#ifndef UNIX #ifndef UNIX
msg_add_fname(buf, sfname); msg_add_fname(buf, sfname);
#else #else
msg_add_fname(buf, fname); msg_add_fname(buf, fname);
#endif #endif
const size_t errmsglen = strlen(errmsg);
if (STRLEN(IObuff) + errmsglen + numlen >= IOSIZE) {
IObuff[IOSIZE - errmsglen - numlen - 1] = NUL;
}
// If the error message has the form "is ...", put the error number in
// front of the file name.
if (errnum != NULL) { if (errnum != NULL) {
STRMOVE(IObuff + numlen, IObuff);
memmove(IObuff, errnum, numlen);
}
xstrlcat((char *)IObuff, errmsg, IOSIZE);
if (errmsgarg != 0) { if (errmsgarg != 0) {
emsgf((const char *)IObuff, os_strerror(errmsgarg)); emsgf("%s: %s%s: %s", errnum, IObuff, errmsg, os_strerror(errmsgarg));
} else { } else {
emsgf((const char *)IObuff); emsgf("%s: %s%s", errnum, IObuff, errmsg);
}
} else if (errmsgarg != 0) {
emsgf(errmsg, os_strerror(errmsgarg));
} else {
emsgf(errmsg);
} }
if (errmsg_allocated) { if (errmsg_allocated) {
xfree(errmsg); xfree(errmsg);
@@ -3822,7 +3814,7 @@ static int set_rw_fname(char_u *fname, char_u *sfname)
/* /*
* Put file name into IObuff with quotes. * Put file name into IObuff with quotes.
*/ */
void msg_add_fname(buf_T *buf, char_u *fname) static void msg_add_fname(buf_T *buf, char_u *fname)
{ {
if (fname == NULL) if (fname == NULL)
fname = (char_u *)"-stdin-"; fname = (char_u *)"-stdin-";