0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

patch 7.4.1276

Problem:    Warning for not using return value of fcntl().
Solution:   Explicitly ignore the return value.
This commit is contained in:
Bram Moolenaar
2016-02-07 15:14:01 +01:00
parent cb4b01230b
commit fbc4b4db3a
5 changed files with 9 additions and 4 deletions

View File

@@ -465,7 +465,7 @@ channel_open(char *hostname, int port_in, int waittime, void (*close_cb)(void))
val = 0; val = 0;
ioctlsocket(sd, FIONBIO, &val); ioctlsocket(sd, FIONBIO, &val);
#else #else
fcntl(sd, F_SETFL, 0); (void)fcntl(sd, F_SETFL, 0);
#endif #endif
} }
@@ -1474,6 +1474,9 @@ channel_parse_messages(void)
return ret; return ret;
} }
/*
* Mark references to lists used in channels.
*/
int int
set_ref_in_channel(int copyID) set_ref_in_channel(int copyID)
{ {

View File

@@ -2350,7 +2350,7 @@ failed:
{ {
int fdflags = fcntl(fd, F_GETFD); int fdflags = fcntl(fd, F_GETFD);
if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
fcntl(fd, F_SETFD, fdflags | FD_CLOEXEC); (void)fcntl(fd, F_SETFD, fdflags | FD_CLOEXEC);
} }
#endif #endif
vim_free(buffer); vim_free(buffer);

View File

@@ -1312,7 +1312,7 @@ mf_do_open(
#ifdef HAVE_FD_CLOEXEC #ifdef HAVE_FD_CLOEXEC
int fdflags = fcntl(mfp->mf_fd, F_GETFD); int fdflags = fcntl(mfp->mf_fd, F_GETFD);
if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) 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 #endif
#if defined(HAVE_SELINUX) || defined(HAVE_SMACK) #if defined(HAVE_SELINUX) || defined(HAVE_SMACK)
mch_copy_sec(fname, mfp->mf_fname); mch_copy_sec(fname, mfp->mf_fname);

View File

@@ -728,7 +728,7 @@ ml_setname(buf_T *buf)
{ {
int fdflags = fcntl(mfp->mf_fd, F_GETFD); int fdflags = fcntl(mfp->mf_fd, F_GETFD);
if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) 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 #endif
} }

View File

@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1276,
/**/ /**/
1275, 1275,
/**/ /**/