diff options
| author | Michael Ennen <mike.ennen@gmail.com> | 2016-05-10 23:30:26 -0700 |
|---|---|---|
| committer | Michael Ennen <mike.ennen@gmail.com> | 2016-05-17 11:24:25 -0700 |
| commit | cf29b4025d67b92755f37947445731ac099a1560 (patch) | |
| tree | eaef9e63b1ba898738839e73730d2d2ec54a4642 | |
| parent | 6396beb432a59c204883f737577a37a4c06a7bc7 (diff) | |
| download | rneovim-cf29b4025d67b92755f37947445731ac099a1560.tar.gz rneovim-cf29b4025d67b92755f37947445731ac099a1560.tar.bz2 rneovim-cf29b4025d67b92755f37947445731ac099a1560.zip | |
vim-patch:7.4.1276
Problem: Warning for not using return value of fcntl().
Solution: Explicitly ignore the return value.
https://github.com/vim/vim/commit/fbc4b4db3a9690906a96e16724350a6241cf32a5
| -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 35b13d6e9e..563ba3939a 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -402,7 +402,7 @@ static int included_patches[] = { // 1279 NA // 1278 NA // 1277 NA - // 1276, + 1276, // 1275 NA // 1274 NA // 1273, |