aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKillTheMule <KillTheMule@users.noreply.github.com>2016-04-23 23:00:59 +0200
committerKillTheMule <KillTheMule@users.noreply.github.com>2016-04-23 23:43:39 +0200
commit23e8d6d94b74c7b6d4e4c766e34500ff220abe96 (patch)
tree3f123ab5a045953af2a8985385df30be78f1fa96 /src
parent445f0d7eed7c96aa30780622e6ee437794529547 (diff)
downloadrneovim-23e8d6d94b74c7b6d4e4c766e34500ff220abe96.tar.gz
rneovim-23e8d6d94b74c7b6d4e4c766e34500ff220abe96.tar.bz2
rneovim-23e8d6d94b74c7b6d4e4c766e34500ff220abe96.zip
Linting.
Diffstat (limited to 'src')
-rw-r--r--src/nvim/ex_cmds2.c3
-rw-r--r--src/nvim/fold.c13
-rw-r--r--src/nvim/if_cscope.c2
-rw-r--r--src/nvim/normal.c10
4 files changed, 17 insertions, 11 deletions
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
index 1005e1bbaa..a0a0b9d3a5 100644
--- a/src/nvim/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
@@ -2373,8 +2373,9 @@ static FILE *fopen_noinh_readbin(char *filename)
# ifdef HAVE_FD_CLOEXEC
{
int fdflags = fcntl(fd_tmp, F_GETFD);
- if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
+ if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) {
(void)fcntl(fd_tmp, F_SETFD, fdflags | FD_CLOEXEC);
+ }
}
# endif
diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index ba84f6aaa5..ac3cf959c8 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -2112,8 +2112,9 @@ static linenr_T foldUpdateIEMSRecurse(garray_T *gap, int level,
&& flp->lvl > 0) {
(void)foldFind(gap, startlnum - 1, &fp);
if (fp >= ((fold_T *)gap->ga_data) + gap->ga_len
- || fp->fd_top >= startlnum)
+ || fp->fd_top >= startlnum) {
fp = NULL;
+ }
}
/*
@@ -2168,12 +2169,14 @@ static linenr_T foldUpdateIEMSRecurse(garray_T *gap, int level,
}
if (lvl < level + i) {
(void)foldFind(&fp->fd_nested, flp->lnum - fp->fd_top, &fp2);
- if (fp2 != NULL)
+ if (fp2 != NULL) {
bot = fp2->fd_top + fp2->fd_len - 1 + fp->fd_top;
- } else if (fp->fd_top + fp->fd_len <= flp->lnum && lvl >= level)
- finish = TRUE;
- else
+ }
+ } else if (fp->fd_top + fp->fd_len <= flp->lnum && lvl >= level) {
+ finish = true;
+ } else {
break;
+ }
}
/* At the start of the first nested fold and at the end of the current
diff --git a/src/nvim/if_cscope.c b/src/nvim/if_cscope.c
index c8bf93b546..2f9ec0b3ff 100644
--- a/src/nvim/if_cscope.c
+++ b/src/nvim/if_cscope.c
@@ -1063,7 +1063,7 @@ static int cs_find_common(char *opt, char *pat, int forceit, int verbose,
*qfpos == '-', cmdline) > 0) {
if (postponed_split != 0) {
(void)win_split(postponed_split > 0 ? postponed_split : 0,
- postponed_split_flags);
+ postponed_split_flags);
RESET_BINDING(curwin);
postponed_split = 0;
}
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 103e6b5027..237e53c5a4 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -2599,8 +2599,9 @@ do_mouse (
else
end_visual.col = rightcol;
if (curwin->w_cursor.lnum >=
- (start_visual.lnum + end_visual.lnum) / 2)
+ (start_visual.lnum + end_visual.lnum) / 2) {
end_visual.lnum = start_visual.lnum;
+ }
/* move VIsual to the right column */
start_visual = curwin->w_cursor; /* save the cursor pos */
@@ -3242,7 +3243,7 @@ void clear_showcmd(void)
top = curwin->w_cursor.lnum;
bot = VIsual.lnum;
}
- /* Include closed folds as a whole. */
+ // Include closed folds as a whole.
(void)hasFolding(top, &top, NULL);
(void)hasFolding(bot, NULL, &bot);
lines = bot - top + 1;
@@ -5150,9 +5151,10 @@ static void nv_gotofile(cmdarg_T *cap)
ptr = grab_file_name(cap->count1, &lnum);
if (ptr != NULL) {
- /* do autowrite if necessary */
- if (curbufIsChanged() && curbuf->b_nwindows <= 1 && !P_HID(curbuf))
+ // do autowrite if necessary
+ if (curbufIsChanged() && curbuf->b_nwindows <= 1 && !P_HID(curbuf)) {
(void)autowrite(curbuf, false);
+ }
setpcmark();
(void)do_ecmd(0, ptr, NULL, NULL, ECMD_LAST,
P_HID(curbuf) ? ECMD_HIDE : 0, curwin);