0
0
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00

updated for version 7.3.677

Problem:    buf_spname() is used inconsistently.
Solution:   Make the return type a char_u pointer.  Check the size of the
            returned string.
This commit is contained in:
Bram Moolenaar
2012-10-03 18:25:00 +02:00
parent b213da0b57
commit e1704bada4
7 changed files with 17 additions and 18 deletions

View File

@@ -780,9 +780,7 @@ ml_open_file(buf)
need_wait_return = TRUE; /* call wait_return later */
++no_wait_return;
(void)EMSG2(_("E303: Unable to open swap file for \"%s\", recovery impossible"),
buf_spname(buf) != NULL
? (char_u *)buf_spname(buf)
: buf->b_fname);
buf_spname(buf) != NULL ? buf_spname(buf) : buf->b_fname);
--no_wait_return;
}
@@ -1315,7 +1313,7 @@ ml_recover()
smsg((char_u *)_("Using swap file \"%s\""), NameBuff);
if (buf_spname(curbuf) != NULL)
STRCPY(NameBuff, buf_spname(curbuf));
vim_strncpy(NameBuff, buf_spname(curbuf), MAXPATHL - 1);
else
home_replace(NULL, curbuf->b_ffname, NameBuff, MAXPATHL, TRUE);
smsg((char_u *)_("Original file \"%s\""), NameBuff);