summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2016-04-16 18:32:29 +0000
committerkrw <krw@openbsd.org>2016-04-16 18:32:29 +0000
commitc8939cf402299d704d258ef2a9e9ffd317bc33f3 (patch)
tree4f2e525846ffb7fafc473d6647db6e5d2e170c0f
parentMake the gmbus code work on valleyview. (diff)
downloadwireguard-openbsd-c8939cf402299d704d258ef2a9e9ffd317bc33f3.tar.xz
wireguard-openbsd-c8939cf402299d704d258ef2a9e9ffd317bc33f3.zip
Change last non-/gnu/ fcntl(x, F_GETFL, 0) strays to fcntl(x, F_GETFL).
No functional change. ok millert@
-rw-r--r--bin/csh/lex.c4
-rw-r--r--usr.sbin/bind/lib/isc/unix/entropy.c2
-rw-r--r--usr.sbin/bind/lib/isc/unix/socket.c2
-rw-r--r--usr.sbin/bind/lib/lwres/context.c2
-rw-r--r--usr.sbin/npppd/pptp/pptp_ctrl.c6
-rw-r--r--usr.sbin/npppd/pptp/pptpd.c8
-rw-r--r--usr.sbin/radiusd/radiusd.c4
7 files changed, 14 insertions, 14 deletions
diff --git a/bin/csh/lex.c b/bin/csh/lex.c
index c206b05558d..4ad9b01853e 100644
--- a/bin/csh/lex.c
+++ b/bin/csh/lex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lex.c,v 1.22 2016/03/20 01:33:39 millert Exp $ */
+/* $OpenBSD: lex.c,v 1.23 2016/04/16 18:32:29 krw Exp $ */
/* $NetBSD: lex.c,v 1.9 1995/09/27 00:38:46 jtc Exp $ */
/*-
@@ -1455,7 +1455,7 @@ again:
if (errno == EWOULDBLOCK) {
int flags;
- flags = fcntl(SHIN, F_GETFL, 0);
+ flags = fcntl(SHIN, F_GETFL);
(void) fcntl(SHIN, F_SETFL, (flags & ~O_NONBLOCK));
}
else if (errno != EINTR)
diff --git a/usr.sbin/bind/lib/isc/unix/entropy.c b/usr.sbin/bind/lib/isc/unix/entropy.c
index 57609868a57..ebe812129fb 100644
--- a/usr.sbin/bind/lib/isc/unix/entropy.c
+++ b/usr.sbin/bind/lib/isc/unix/entropy.c
@@ -452,7 +452,7 @@ make_nonblock(int fd) {
ret = ioctl(fd, FIONBIO, (char *)&on);
#else
- flags = fcntl(fd, F_GETFL, 0);
+ flags = fcntl(fd, F_GETFL);
flags |= PORT_NONBLOCK;
ret = fcntl(fd, F_SETFL, flags);
#endif
diff --git a/usr.sbin/bind/lib/isc/unix/socket.c b/usr.sbin/bind/lib/isc/unix/socket.c
index 98bf327c19a..34f75e023c6 100644
--- a/usr.sbin/bind/lib/isc/unix/socket.c
+++ b/usr.sbin/bind/lib/isc/unix/socket.c
@@ -491,7 +491,7 @@ make_nonblock(int fd) {
ret = ioctl(fd, FIONBIO, (char *)&on);
#else
- flags = fcntl(fd, F_GETFL, 0);
+ flags = fcntl(fd, F_GETFL);
flags |= PORT_NONBLOCK;
ret = fcntl(fd, F_SETFL, flags);
#endif
diff --git a/usr.sbin/bind/lib/lwres/context.c b/usr.sbin/bind/lib/lwres/context.c
index 950cb3531dc..823620edd04 100644
--- a/usr.sbin/bind/lib/lwres/context.c
+++ b/usr.sbin/bind/lib/lwres/context.c
@@ -120,7 +120,7 @@
#ifndef MAKE_NONBLOCKING
#define MAKE_NONBLOCKING(sd, retval) \
do { \
- retval = fcntl(sd, F_GETFL, 0); \
+ retval = fcntl(sd, F_GETFL); \
if (retval != -1) { \
retval |= O_NONBLOCK; \
retval = fcntl(sd, F_SETFL, retval); \
diff --git a/usr.sbin/npppd/pptp/pptp_ctrl.c b/usr.sbin/npppd/pptp/pptp_ctrl.c
index 1dfdc030b87..e9c85c4b36e 100644
--- a/usr.sbin/npppd/pptp/pptp_ctrl.c
+++ b/usr.sbin/npppd/pptp/pptp_ctrl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pptp_ctrl.c,v 1.10 2015/05/12 05:30:24 yasuoka Exp $ */
+/* $OpenBSD: pptp_ctrl.c,v 1.11 2016/04/16 18:32:29 krw Exp $ */
/*-
* Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -29,7 +29,7 @@
* PPTP(RFC 2637) control connection implementation.
* currently it only support PAC part
*/
-/* $Id: pptp_ctrl.c,v 1.10 2015/05/12 05:30:24 yasuoka Exp $ */
+/* $Id: pptp_ctrl.c,v 1.11 2016/04/16 18:32:29 krw Exp $ */
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -181,7 +181,7 @@ pptp_ctrl_start(pptp_ctrl *_this)
pptp_ctrl_log(_this, LOG_INFO, "Starting peer=%s:%s/tcp "
"sock=%s:%s/tcp", hbuf0, sbuf0, hbuf1, sbuf1);
- if ((ival = fcntl(_this->sock, F_GETFL, 0)) < 0) {
+ if ((ival = fcntl(_this->sock, F_GETFL)) < 0) {
pptp_ctrl_log(_this, LOG_ERR,
"fcntl(F_GET_FL) failed at %s(): %m", __func__);
goto fail;
diff --git a/usr.sbin/npppd/pptp/pptpd.c b/usr.sbin/npppd/pptp/pptpd.c
index 0c6475cb7ee..abbdd568fde 100644
--- a/usr.sbin/npppd/pptp/pptpd.c
+++ b/usr.sbin/npppd/pptp/pptpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pptpd.c,v 1.30 2016/03/21 00:49:36 guenther Exp $ */
+/* $OpenBSD: pptpd.c,v 1.31 2016/04/16 18:32:29 krw Exp $ */
/*-
* Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -25,12 +25,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $Id: pptpd.c,v 1.30 2016/03/21 00:49:36 guenther Exp $ */
+/* $Id: pptpd.c,v 1.31 2016/04/16 18:32:29 krw Exp $ */
/**@file
* This file provides a implementation of PPTP daemon. Currently it
* provides functions for PAC (PPTP Access Concentrator) only.
- * $Id: pptpd.c,v 1.30 2016/03/21 00:49:36 guenther Exp $
+ * $Id: pptpd.c,v 1.31 2016/04/16 18:32:29 krw Exp $
*/
#include <sys/types.h>
#include <sys/socket.h>
@@ -358,7 +358,7 @@ pptpd_listener_start(pptpd_listener *_this)
pptpd_log(_this->self, LOG_WARNING,
"%s(): setsockopt(IP_PIPEX) failed: %m", __func__);
#endif
- if ((ival = fcntl(sock_gre, F_GETFL, 0)) < 0) {
+ if ((ival = fcntl(sock_gre, F_GETFL)) < 0) {
pptpd_log(_this->self, LOG_ERR,
"fcntl(F_GET_FL) failed at %s(): %m", __func__);
goto fail;
diff --git a/usr.sbin/radiusd/radiusd.c b/usr.sbin/radiusd/radiusd.c
index 67eac058905..98e3b23ccd8 100644
--- a/usr.sbin/radiusd/radiusd.c
+++ b/usr.sbin/radiusd/radiusd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: radiusd.c,v 1.17 2016/04/13 06:33:36 semarie Exp $ */
+/* $OpenBSD: radiusd.c,v 1.18 2016/04/16 18:32:29 krw Exp $ */
/*
* Copyright (c) 2013 Internet Initiative Japan Inc.
@@ -967,7 +967,7 @@ radiusd_module_load(struct radiusd *radiusd, const char *path, const char *name)
close(pairsock[1]);
module->fd = pairsock[0];
- if ((ival = fcntl(module->fd, F_GETFL, 0)) < 0) {
+ if ((ival = fcntl(module->fd, F_GETFL)) < 0) {
log_warn("Could not load module `%s': fcntl(F_GETFL)",
name);
goto on_error;