diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-05-29 00:05:49 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-05-29 00:05:49 -0400 |
| commit | ecbc9dbdfeebc3593f178127f44ef979b446b633 (patch) | |
| tree | 1483707010a987c2b31d32b2bc427d81343735b1 /src | |
| parent | 1e70ebe849e3e2a0bf9605485d5ef8c6b86b0e52 (diff) | |
| parent | cf29b4025d67b92755f37947445731ac099a1560 (diff) | |
| download | rneovim-ecbc9dbdfeebc3593f178127f44ef979b446b633.tar.gz rneovim-ecbc9dbdfeebc3593f178127f44ef979b446b633.tar.bz2 rneovim-ecbc9dbdfeebc3593f178127f44ef979b446b633.zip | |
Merge pull request #4740 from brcolow/vim-7.4.1276
vim-patch:7.4.1276
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/fileio.c | 5 | ||||
| -rw-r--r-- | src/nvim/memfile.c | 2 | ||||
| -rw-r--r-- | src/nvim/memline.c | 5 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index db1469db97..4d9e10fb85 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -1749,8 +1749,9 @@ failed: #ifdef HAVE_FD_CLOEXEC else { int fdflags = fcntl(fd, F_GETFD); - if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) - fcntl(fd, F_SETFD, fdflags | FD_CLOEXEC); + if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) { + (void)fcntl(fd, F_SETFD, fdflags | FD_CLOEXEC); + } } #endif xfree(buffer); diff --git a/src/nvim/memfile.c b/src/nvim/memfile.c index 6599db787f..9fb03c4ac7 100644 --- a/src/nvim/memfile.c +++ b/src/nvim/memfile.c @@ -913,7 +913,7 @@ static bool mf_do_open(memfile_T *mfp, char_u *fname, int flags) #ifdef HAVE_FD_CLOEXEC int fdflags = fcntl(mfp->mf_fd, F_GETFD); if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) { - fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC); + (void)fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC); } #endif #ifdef HAVE_SELINUX diff --git a/src/nvim/memline.c b/src/nvim/memline.c index 4e35dd481f..9c20f15727 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -443,8 +443,9 @@ void ml_setname(buf_T *buf) #ifdef HAVE_FD_CLOEXEC { int fdflags = fcntl(mfp->mf_fd, F_GETFD); - if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) - fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC); + if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) { + (void)fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC); + } } #endif } diff --git a/src/nvim/version.c b/src/nvim/version.c index 2ba8deb0ce..844c21916f 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -416,7 +416,7 @@ static int included_patches[] = { // 1279 NA // 1278 NA // 1277 NA - // 1276, + 1276, // 1275 NA // 1274 NA // 1273, |