diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-04-05 14:26:26 +0900 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2018-08-24 16:47:08 +0200 |
| commit | 9960b544dea9771c91b10c7d19be1525f9169035 (patch) | |
| tree | adaf757443af719ba08512d03e4878f0eda3ee99 | |
| parent | ef80cac536e2864258725a1392bb3726c4f09dbe (diff) | |
tree-wide: use TAKE_PTR() and TAKE_FD() macros
| -rw-r--r-- | src/libelogind/sd-bus/sd-bus.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/libelogind/sd-bus/sd-bus.c b/src/libelogind/sd-bus/sd-bus.c index c5013f98c..71a96ac00 100644 --- a/src/libelogind/sd-bus/sd-bus.c +++ b/src/libelogind/sd-bus/sd-bus.c @@ -527,8 +527,7 @@ static int synthesize_connected_signal(sd_bus *bus) { /* Insert at the very front */ memmove(bus->rqueue + 1, bus->rqueue, sizeof(sd_bus_message*) * bus->rqueue_size); - bus->rqueue[0] = m; - m = NULL; + bus->rqueue[0] = TAKE_PTR(m); bus->rqueue_size++; return 0; @@ -2788,8 +2787,8 @@ static int process_running(sd_bus *bus, bool hint_priority, int64_t priority, sd if (r < 0) return r; - *ret = m; - m = NULL; + *ret = TAKE_PTR(m); + return 1; } @@ -2948,10 +2947,8 @@ static int process_closing(sd_bus *bus, sd_bus_message **ret) { bus->exit_triggered = true; (void) bus_exit_now(bus); - if (ret) { - *ret = m; - m = NULL; - } + if (ret) + *ret = TAKE_PTR(m); r = 1; |