diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-07 15:14:01 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-07 15:14:01 +0100 |
| commit | fbc4b4db3a9690906a96e16724350a6241cf32a5 (patch) | |
| tree | 5d4ce0eb662b5d979696600ce3257648fc59556d | |
| parent | cb4b01230be26ada92a1622c2278277d59ef2ec1 (diff) | |
patch 7.4.1276v7.4.1276
Problem: Warning for not using return value of fcntl().
Solution: Explicitly ignore the return value.
| -rw-r--r-- | src/channel.c | 5 | ||||
| -rw-r--r-- | src/fileio.c | 2 | ||||
| -rw-r--r-- | src/memfile.c | 2 | ||||
| -rw-r--r-- | src/memline.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/src/channel.c b/src/channel.c index d621798608..811d87ae1c 100644 --- a/src/channel.c +++ b/src/channel.c @@ -465,7 +465,7 @@ channel_open(char *hostname, int port_in, int waittime, void (*close_cb)(void)) val = 0; ioctlsocket(sd, FIONBIO, &val); #else - fcntl(sd, F_SETFL, 0); + (void)fcntl(sd, F_SETFL, 0); #endif } @@ -1474,6 +1474,9 @@ channel_parse_messages(void) return ret; } +/* + * Mark references to lists used in channels. + */ int set_ref_in_channel(int copyID) { diff --git a/src/fileio.c b/src/fileio.c index ecec7571a9..f0ef675323 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -2350,7 +2350,7 @@ failed: { int fdflags = fcntl(fd, F_GETFD); if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) - fcntl(fd, F_SETFD, fdflags | FD_CLOEXEC); + (void)fcntl(fd, F_SETFD, fdflags | FD_CLOEXEC); } #endif vim_free(buffer); diff --git a/src/memfile.c b/src/memfile.c index 4db84dfcc3..56719eec7c 100644 --- a/src/memfile.c +++ b/src/memfile.c @@ -1312,7 +1312,7 @@ mf_do_open( #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 #if defined(HAVE_SELINUX) || defined(HAVE_SMACK) mch_copy_sec(fname, mfp->mf_fname); diff --git a/src/memline.c b/src/memline.c index 969e1e292f..1cb1bb083e 100644 --- a/src/memline.c +++ b/src/memline.c @@ -728,7 +728,7 @@ ml_setname(buf_T *buf) { 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 } diff --git a/src/version.c b/src/version.c index a3c27cdd53..6e553886d6 100644 --- a/src/version.c +++ b/src/version.c @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1276, +/**/ 1275, /**/ 1274, |