diff options
| author | David Herrmann <dh.herrmann@googlemail.com> | 2015-07-04 12:41:01 +0200 |
|---|---|---|
| committer | David Herrmann <dh.herrmann@googlemail.com> | 2015-07-04 12:41:01 +0200 |
| commit | 6acc94b6211af2c259453b9e6aa29c44967796f0 (patch) | |
| tree | f38e6680b90804cdcc46a1cf921a38b2af080cbc /src/bus-proxyd/proxy.c | |
| parent | a0c8526a7376a7ef9692a3db6700e574fc714e7c (diff) | |
| parent | 03976f7b4a84b8b1492a549a3470b2bba8f37008 (diff) | |
Merge pull request #485 from poettering/sd-bus-flush-close-unref
sd-bus: introduce new sd_bus_flush_close_unref() call
Diffstat (limited to 'src/bus-proxyd/proxy.c')
| -rw-r--r-- | src/bus-proxyd/proxy.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bus-proxyd/proxy.c b/src/bus-proxyd/proxy.c index 1dc55171e7..c0055d3788 100644 --- a/src/bus-proxyd/proxy.c +++ b/src/bus-proxyd/proxy.c @@ -45,7 +45,7 @@ #include "formats-util.h" static int proxy_create_destination(Proxy *p, const char *destination, const char *local_sec, bool negotiate_fds) { - _cleanup_bus_close_unref_ sd_bus *b = NULL; + _cleanup_bus_flush_close_unref_ sd_bus *b = NULL; int r; r = sd_bus_new(&b); @@ -101,7 +101,7 @@ static int proxy_create_destination(Proxy *p, const char *destination, const cha } static int proxy_create_local(Proxy *p, int in_fd, int out_fd, bool negotiate_fds) { - _cleanup_bus_close_unref_ sd_bus *b = NULL; + _cleanup_bus_flush_close_unref_ sd_bus *b = NULL; sd_id128_t server_id; int r; @@ -238,8 +238,8 @@ Proxy *proxy_free(Proxy *p) { if (!p) return NULL; - sd_bus_close_unrefp(&p->local_bus); - sd_bus_close_unrefp(&p->destination_bus); + sd_bus_flush_close_unref(p->local_bus); + sd_bus_flush_close_unref(p->destination_bus); set_free_free(p->owned_names); free(p); |