patch 7.4.1276

Problem:    Warning for not using return value of fcntl().
Solution:   Explicitly ignore the return value.

diff --git a/src/channel.c b/src/channel.c
index d6217986089771fcc25daea90acdff5220b0299e..811d87ae1c2b7c1651059f6ab72a930081612581 100644 (file)
--- 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 ecec7571a997fa3799005f8b099db73ebbf05661..f0ef675323ab13d78c9f6d5e9fccc7e920174848 100644 (file)
--- 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 4db84dfcc32ddcfa219ac031afff1bcd8ef14889..56719eec7c464e26a6bd9ea723836965e0bc4b7a 100644 (file)
--- 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 969e1e292ff11e14360e0ac852a1a23914efcd8d..1cb1bb083e97e9d0b8670adf8029f39a89bebe5a 100644 (file)
--- 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 a3c27cdd5393c24d405ef45ff73be6b6265f3716..6e553886d6a1c9ea46dd7e04422f2a406d348ea0 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1276,
 /**/
     1275,
 /**/