summaryrefslogtreecommitdiff
path: root/src/shared/bus-util.c
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2018-04-05 14:26:26 +0900
committerSven Eden <yamakuzure@gmx.net>2018-08-24 16:47:08 +0200
commitafe009a2dcf9b5e5908878e712bbe8cce170b41e (patch)
tree340c3133ddd6ab249740f65563857de1e9ce0b71 /src/shared/bus-util.c
parentd8a0bb74926399cabbea7760fdcfb3319b09b5de (diff)
tree-wide: use TAKE_PTR() and TAKE_FD() macros
Diffstat (limited to 'src/shared/bus-util.c')
-rw-r--r--src/shared/bus-util.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 870ffbb26..ff098b703 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -607,8 +607,7 @@ int bus_connect_system_systemd(sd_bus **_bus) {
if (r < 0)
return r;
- *_bus = bus;
- bus = NULL;
+ *_bus = TAKE_PTR(bus);
return 0;
}
@@ -645,8 +644,7 @@ int bus_connect_user_systemd(sd_bus **_bus) {
if (r < 0)
return r;
- *_bus = bus;
- bus = NULL;
+ *_bus = TAKE_PTR(bus);
return 0;
}
@@ -1346,8 +1344,7 @@ int bus_connect_transport(BusTransport transport, const char *host, bool user, s
if (r < 0)
return r;
- *ret = bus;
- bus = NULL;
+ *ret = TAKE_PTR(bus);
return 0;
}
@@ -1736,8 +1733,7 @@ int bus_open_system_watch_bind(sd_bus **ret) {
if (r < 0)
return r;
- *ret = bus;
- bus = NULL;
+ *ret = TAKE_PTR(bus);
return 0;
}