diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2016-05-01 17:30:38 -0400 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2016-05-01 17:30:38 -0400 |
commit | d542de4a76dd9e600ebcf1405efdc9d3090ad9a8 (patch) | |
tree | 60b1d2aad6205c74b7c2611fbbed45759a302f4f /src/nvim/path.c | |
parent | 91afb30b667bbc321d351708f694d00b256be585 (diff) | |
parent | cf4e1fb0f4962319eee292248d9c1f73be3a8d0c (diff) | |
download | rneovim-d542de4a76dd9e600ebcf1405efdc9d3090ad9a8.tar.gz rneovim-d542de4a76dd9e600ebcf1405efdc9d3090ad9a8.tar.bz2 rneovim-d542de4a76dd9e600ebcf1405efdc9d3090ad9a8.zip |
Merge pull request #4688 from ZyX-I/clint-checks
Add check for boolean operators placement
Diffstat (limited to 'src/nvim/path.c')
-rw-r--r-- | src/nvim/path.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/nvim/path.c b/src/nvim/path.c index 29ff62ef77..80ad643aa1 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -1301,9 +1301,10 @@ void addfile( FileInfo file_info; // if the file/dir/link doesn't exist, may not add it - if (!(flags & EW_NOTFOUND) && - ((flags & EW_ALLLINKS) ? - !os_fileinfo_link((char *)f, &file_info) : !os_file_exists(f))) { + if (!(flags & EW_NOTFOUND) + && ((flags & EW_ALLLINKS) + ? !os_fileinfo_link((char *)f, &file_info) + : !os_file_exists(f))) { return; } @@ -1383,9 +1384,9 @@ void simplify_filename(char_u *filename) --p; /* strip preceding path separator */ STRMOVE(p, tail); } - } else if (p[0] == '.' && p[1] == '.' && - (vim_ispathsep(p[2]) || p[2] == NUL)) { - /* Skip to after ".." or "../" or "..///". */ + } else if (p[0] == '.' && p[1] == '.' + && (vim_ispathsep(p[2]) || p[2] == NUL)) { + // Skip to after ".." or "../" or "..///". tail = p + 2; while (vim_ispathsep(*tail)) mb_ptr_adv(tail); @@ -2016,8 +2017,8 @@ int match_suffix(char_u *fname) break; } } else { - if (fnamelen >= setsuflen && - fnamencmp(suf_buf, fname + fnamelen - setsuflen, setsuflen) == 0) { + if (fnamelen >= setsuflen + && fnamencmp(suf_buf, fname + fnamelen - setsuflen, setsuflen) == 0) { break; } setsuflen = 0; |