aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/diff.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2018-02-07 02:32:50 +0100
committerGitHub <noreply@github.com>2018-02-07 02:32:50 +0100
commit538361955d123d9c93387f7597303c0ef59c6825 (patch)
treeda1fb4713917fd39fe6c3df2b06fc40a8d7ff71e /src/nvim/diff.c
parentb1412dc412e1308806ff65281d3dc29c1ffc7bdf (diff)
downloadrneovim-538361955d123d9c93387f7597303c0ef59c6825.tar.gz
rneovim-538361955d123d9c93387f7597303c0ef59c6825.tar.bz2
rneovim-538361955d123d9c93387f7597303c0ef59c6825.zip
exit: annotate FUNC_ATTR_NORETURN functions #7954 (#7954)
This should fix a particular false positive from clang 5.0.0 scan-build, which thinks that nlua_init() can continue after preserve_exit().
Diffstat (limited to 'src/nvim/diff.c')
-rw-r--r--src/nvim/diff.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index c2ab57a59b..e55cf7bf7e 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -855,7 +855,7 @@ void ex_diffpatch(exarg_T *eap)
{
char_u *buf = NULL;
win_T *old_curwin = curwin;
- char_u *newname = NULL; // name of patched file buffer
+ char_u *newname = NULL; // name of patched file buffer
char_u *esc_name = NULL;
#ifdef UNIX
@@ -886,9 +886,9 @@ void ex_diffpatch(exarg_T *eap)
esc_name = vim_strsave_shellescape(
#ifdef UNIX
- fullname != NULL ? fullname :
+ fullname != NULL ? fullname :
#endif
- eap->arg, true, true);
+ eap->arg, true, true);
if (esc_name == NULL) {
goto theend;
}