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:
ef80cac
)
tree-wide: use TAKE_PTR() and TAKE_FD() macros
author
Yu Watanabe
<watanabe.yu+github@gmail.com>
Thu, 5 Apr 2018 05:26:26 +0000
(14:26 +0900)
committer
Sven Eden
<yamakuzure@gmx.net>
Fri, 24 Aug 2018 14:47:08 +0000
(16:47 +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 c5013f98c293652b4a7e02ba4839b18710ce1e10..71a96ac006bd05b467250c19b930dd57589e3933 100644
(file)
--- 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;