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

diff: Fix PVS/V547: remove no longer needed OOM handler

Browse Source
This commit is contained in:
ZyX
2018-04-09 10:23:11 +03:00
parent 5acda03576
commit ef57cd81fe
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/diff.c
View File

@@ -859,9 +859,9 @@ void ex_diffpatch(exarg_T *eap)
char_u *esc_name = NULL; char_u *esc_name = NULL;
#ifdef UNIX #ifdef UNIX
char_u dirbuf[MAXPATHL]; char *fullname = NULL;
char_u *fullname = NULL;
#endif #endif
// We need two temp file names. // We need two temp file names.
// Name of original temp file. // Name of original temp file.
char_u *tmp_orig = vim_tempname(); char_u *tmp_orig = vim_tempname();
@@ -881,21 +881,17 @@ void ex_diffpatch(exarg_T *eap)
#ifdef UNIX #ifdef UNIX
// Get the absolute path of the patchfile, changing directory below. // Get the absolute path of the patchfile, changing directory below.
fullname = (char_u *)FullName_save((char *)eap->arg, false); fullname = FullName_save((char *)eap->arg, false);
#endif
esc_name = vim_strsave_shellescape( esc_name = vim_strsave_shellescape(
#ifdef UNIX (fullname != NULL ? (char_u *)fullname : eap->arg), true, true);
fullname != NULL ? fullname : #else
esc_name = vim_strsave_shellescape(eap->arg, true, true);
#endif #endif
eap->arg, true, true);
if (esc_name == NULL) {
goto theend;
}
size_t buflen = STRLEN(tmp_orig) + STRLEN(esc_name) + STRLEN(tmp_new) + 16; size_t buflen = STRLEN(tmp_orig) + STRLEN(esc_name) + STRLEN(tmp_new) + 16;
buf = xmalloc(buflen); buf = xmalloc(buflen);
#ifdef UNIX #ifdef UNIX
char_u dirbuf[MAXPATHL];
// Temporarily chdir to /tmp, to avoid patching files in the current // Temporarily chdir to /tmp, to avoid patching files in the current
// directory when the patch file contains more than one patch. When we // directory when the patch file contains more than one patch. When we
// have our own temp dir use that instead, it will be cleaned up when we // have our own temp dir use that instead, it will be cleaned up when we
@@ -918,7 +914,7 @@ void ex_diffpatch(exarg_T *eap)
// Use 'patchexpr' to generate the new file. // Use 'patchexpr' to generate the new file.
#ifdef UNIX #ifdef UNIX
eval_patch((char *)tmp_orig, eval_patch((char *)tmp_orig,
(char *)(fullname != NULL ? fullname : eap->arg), (fullname != NULL ? fullname : (char *)eap->arg),
(char *)tmp_new); (char *)tmp_new);
#else #else
eval_patch((char *)tmp_orig, (char *)eap->arg, (char *)tmp_new); eval_patch((char *)tmp_orig, (char *)eap->arg, (char *)tmp_new);