diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-02-21 17:35:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-21 17:35:01 -0500 |
| commit | 5978bdd05fed013d301f6d8b089c7c7ea8c0ef8e (patch) | |
| tree | 676c5bd2a479a80cbce71ba02c1ada8883989540 /src/libsystemd/sd-netlink/netlink-socket.c | |
| parent | a3d8d68cc1698d014575f0f66c58e253bd46c240 (diff) | |
| parent | bcab914f7fb0570eb728907163ada55c6ae3d602 (diff) | |
Merge pull request #5411 from poettering/various-pre-v233-fixes
Various pre v233 fixes.
Diffstat (limited to 'src/libsystemd/sd-netlink/netlink-socket.c')
| -rw-r--r-- | src/libsystemd/sd-netlink/netlink-socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsystemd/sd-netlink/netlink-socket.c b/src/libsystemd/sd-netlink/netlink-socket.c index a0fd8a3ac9..129bfd2d80 100644 --- a/src/libsystemd/sd-netlink/netlink-socket.c +++ b/src/libsystemd/sd-netlink/netlink-socket.c @@ -281,7 +281,7 @@ static int socket_recv_message(int fd, struct iovec *iov, uint32_t *_group, bool else if (errno == EAGAIN) log_debug("rtnl: no data in socket"); - return (errno == EAGAIN || errno == EINTR) ? 0 : -errno; + return IN_SET(errno, EAGAIN, EINTR) ? 0 : -errno; } if (sender.nl.nl_pid != 0) { @@ -292,7 +292,7 @@ static int socket_recv_message(int fd, struct iovec *iov, uint32_t *_group, bool /* drop the message */ r = recvmsg(fd, &msg, 0); if (r < 0) - return (errno == EAGAIN || errno == EINTR) ? 0 : -errno; + return IN_SET(errno, EAGAIN, EINTR) ? 0 : -errno; } return 0; |