aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2015-10-19 15:32:06 +0300
committerZyX <kp-pav@yandex.ru>2015-10-23 15:56:50 +0300
commitca6235c20f4ac53cdc9f87857b6221a2841fe10e (patch)
tree321f2915431788a186ffae13e6e437dcaeeec819
parenta8e18d9b5a74c8d061f383e0da7a88813db59502 (diff)
downloadrneovim-ca6235c20f4ac53cdc9f87857b6221a2841fe10e.tar.gz
rneovim-ca6235c20f4ac53cdc9f87857b6221a2841fe10e.tar.bz2
rneovim-ca6235c20f4ac53cdc9f87857b6221a2841fe10e.zip
*: Fix linter errors
-rw-r--r--src/nvim/main.c2
-rw-r--r--src/nvim/memline.c4
-rw-r--r--src/nvim/path.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 3c1d59567b..c10db29d1f 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -1873,7 +1873,7 @@ static void source_startup_scripts(mparm_T *parmp)
else
secure = 0;
#endif
- (void) do_source((char_u *)EXRC_FILE, FALSE, DOSO_NONE);
+ (void) do_source((char_u *)EXRC_FILE, false, DOSO_NONE);
}
}
xfree(user_vimrc);
diff --git a/src/nvim/memline.c b/src/nvim/memline.c
index 2ff7cb3e19..aa3e0e0b1c 100644
--- a/src/nvim/memline.c
+++ b/src/nvim/memline.c
@@ -3385,10 +3385,10 @@ static char *findswapname(buf_T *buf, char **dirp, char *old_fname,
name = xmalloc(fname_len
+ strlen(_("Swap file \""))
+ strlen(_("\" already exists!")) + 5);
- strcpy(name, _("Swap file \""));
+ STRCPY(name, _("Swap file \""));
home_replace(NULL, (char_u *) fname, (char_u *)&name[strlen(name)],
fname_len, true);
- strcat(name, _("\" already exists!"));
+ STRCAT(name, _("\" already exists!"));
choice = do_dialog(VIM_WARNING,
(char_u *)_("VIM - ATTENTION"),
(char_u *)(name == NULL
diff --git a/src/nvim/path.c b/src/nvim/path.c
index e30f6b08d9..eaca85ed40 100644
--- a/src/nvim/path.c
+++ b/src/nvim/path.c
@@ -376,7 +376,7 @@ char *concat_fnames(const char *fname1, const char *fname2, bool sep)
/// Concatenate file names fname1 and fname2
///
/// Like concat_fnames(), but in place of allocating new memory it reallocates
-/// fname1. For this reason fname1 must be allocated with xmalloc, and can no
+/// fname1. For this reason fname1 must be allocated with xmalloc, and can no
/// longer be used after running concat_fnames_realloc.
///
/// @param fname1 is the first part of the path or filename