chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
34267db
)
sd-bus: use IN_SET
author
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Sat, 16 Apr 2016 22:21:58 +0000
(18:21 -0400)
committer
Sven Eden
<yamakuzure@gmx.net>
Fri, 16 Jun 2017 08:12:57 +0000
(10:12 +0200)
src/libelogind/sd-bus/sd-bus.c
patch
|
blob
|
history
diff --git
a/src/libelogind/sd-bus/sd-bus.c
b/src/libelogind/sd-bus/sd-bus.c
index 3821e1b8173c97e8fa6d800f3e7eb31736d956ba..6d304719e61f55d82467123aac2e5805d8b14693 100644
(file)
--- a/
src/libelogind/sd-bus/sd-bus.c
+++ b/
src/libelogind/sd-bus/sd-bus.c
@@
-1798,7
+1798,7
@@
static int bus_send_internal(sd_bus *bus, sd_bus_message *_m, uint64_t *cookie,
r = bus_write_message(bus, m, hint_sync_call, &idx);
if (r < 0) {
r = bus_write_message(bus, m, hint_sync_call, &idx);
if (r < 0) {
- if (
r == -ENOTCONN || r == -ECONNRESET || r == -EPIPE || r == -ESHUTDOWN
) {
+ if (
IN_SET(r, -ENOTCONN, -ECONNRESET, -EPIPE, -ESHUTDOWN)
) {
bus_enter_closing(bus);
return -ECONNRESET;
}
bus_enter_closing(bus);
return -ECONNRESET;
}
@@
-2105,7
+2105,7
@@
_public_ int sd_bus_call(
r = bus_read_message(bus, false, 0);
if (r < 0) {
r = bus_read_message(bus, false, 0);
if (r < 0) {
- if (
r == -ENOTCONN || r == -ECONNRESET || r == -EPIPE || r == -ESHUTDOWN
) {
+ if (
IN_SET(r, -ENOTCONN, -ECONNRESET, -EPIPE, -ESHUTDOWN)
) {
bus_enter_closing(bus);
r = -ECONNRESET;
}
bus_enter_closing(bus);
r = -ECONNRESET;
}
@@
-2138,7
+2138,7
@@
_public_ int sd_bus_call(
r = dispatch_wqueue(bus);
if (r < 0) {
r = dispatch_wqueue(bus);
if (r < 0) {
- if (
r == -ENOTCONN || r == -ECONNRESET || r == -EPIPE || r == -ESHUTDOWN
) {
+ if (
IN_SET(r, -ENOTCONN, -ECONNRESET, -EPIPE, -ESHUTDOWN)
) {
bus_enter_closing(bus);
r = -ECONNRESET;
}
bus_enter_closing(bus);
r = -ECONNRESET;
}
@@
-2790,7
+2790,7
@@
static int bus_process_internal(sd_bus *bus, bool hint_priority, int64_t priorit
case BUS_OPENING:
r = bus_socket_process_opening(bus);
case BUS_OPENING:
r = bus_socket_process_opening(bus);
- if (
r == -ENOTCONN || r == -ECONNRESET || r == -EPIPE || r == -ESHUTDOWN
) {
+ if (
IN_SET(r, -ENOTCONN, -ECONNRESET, -EPIPE, -ESHUTDOWN)
) {
bus_enter_closing(bus);
r = 1;
} else if (r < 0)
bus_enter_closing(bus);
r = 1;
} else if (r < 0)
@@
-2801,7
+2801,7
@@
static int bus_process_internal(sd_bus *bus, bool hint_priority, int64_t priorit
case BUS_AUTHENTICATING:
r = bus_socket_process_authenticating(bus);
case BUS_AUTHENTICATING:
r = bus_socket_process_authenticating(bus);
- if (
r == -ENOTCONN || r == -ECONNRESET || r == -EPIPE || r == -ESHUTDOWN
) {
+ if (
IN_SET(r, -ENOTCONN, -ECONNRESET, -EPIPE, -ESHUTDOWN)
) {
bus_enter_closing(bus);
r = 1;
} else if (r < 0)
bus_enter_closing(bus);
r = 1;
} else if (r < 0)
@@
-2815,7
+2815,7
@@
static int bus_process_internal(sd_bus *bus, bool hint_priority, int64_t priorit
case BUS_RUNNING:
case BUS_HELLO:
r = process_running(bus, hint_priority, priority, ret);
case BUS_RUNNING:
case BUS_HELLO:
r = process_running(bus, hint_priority, priority, ret);
- if (
r == -ENOTCONN || r == -ECONNRESET || r == -EPIPE || r == -ESHUTDOWN
) {
+ if (
IN_SET(r, -ENOTCONN, -ECONNRESET, -EPIPE, -ESHUTDOWN)
) {
bus_enter_closing(bus);
r = 1;
bus_enter_closing(bus);
r = 1;
@@
-2940,7
+2940,7
@@
_public_ int sd_bus_flush(sd_bus *bus) {
for (;;) {
r = dispatch_wqueue(bus);
if (r < 0) {
for (;;) {
r = dispatch_wqueue(bus);
if (r < 0) {
- if (
r == -ENOTCONN || r == -ECONNRESET || r == -EPIPE || r == -ESHUTDOWN
) {
+ if (
IN_SET(r, -ENOTCONN, -ECONNRESET, -EPIPE, -ESHUTDOWN)
) {
bus_enter_closing(bus);
return -ECONNRESET;
}
bus_enter_closing(bus);
return -ECONNRESET;
}