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/nss-resolve | |
| 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/nss-resolve')
| -rw-r--r-- | src/nss-resolve/nss-resolve.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nss-resolve/nss-resolve.c b/src/nss-resolve/nss-resolve.c index 8f181a6c72..da22f98eba 100644 --- a/src/nss-resolve/nss-resolve.c +++ b/src/nss-resolve/nss-resolve.c @@ -122,7 +122,7 @@ enum nss_status _nss_resolve_gethostbyname4_r( _cleanup_bus_message_unref_ sd_bus_message *req = NULL, *reply = NULL; _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; struct gaih_addrtuple *r_tuple, *r_tuple_first = NULL; - _cleanup_bus_close_unref_ sd_bus *bus = NULL; + _cleanup_bus_flush_close_unref_ sd_bus *bus = NULL; const char *canonical = NULL; size_t l, ms, idx; char *r_name; @@ -305,7 +305,7 @@ enum nss_status _nss_resolve_gethostbyname3_r( _cleanup_bus_message_unref_ sd_bus_message *req = NULL, *reply = NULL; _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; char *r_name, *r_aliases, *r_addr, *r_addr_list; - _cleanup_bus_close_unref_ sd_bus *bus = NULL; + _cleanup_bus_flush_close_unref_ sd_bus *bus = NULL; size_t l, idx, ms, alen; const char *canonical; int c, r, i = 0, ifindex; @@ -513,7 +513,7 @@ enum nss_status _nss_resolve_gethostbyaddr2_r( _cleanup_bus_message_unref_ sd_bus_message *req = NULL, *reply = NULL; _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; char *r_name, *r_aliases, *r_addr, *r_addr_list; - _cleanup_bus_close_unref_ sd_bus *bus = NULL; + _cleanup_bus_flush_close_unref_ sd_bus *bus = NULL; unsigned c = 0, i = 0; size_t ms = 0, idx; const char *n; |