From 6e18964d3a365567954fe10ddcfad74babdc427c Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Tue, 4 Mar 2014 09:20:51 -0500 Subject: Introduce strv_consume which takes ownership This mirrors set_consume and makes the common use a bit nicer. --- src/libsystemd/sd-bus/bus-control.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/libsystemd/sd-bus/bus-control.c') diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c index 22b95d589d..db0c11b0fe 100644 --- a/src/libsystemd/sd-bus/bus-control.c +++ b/src/libsystemd/sd-bus/bus-control.c @@ -237,11 +237,9 @@ static int kernel_get_list(sd_bus *bus, uint64_t flags, char ***x) { if (asprintf(&n, ":1.%llu", (unsigned long long) name->owner_id) < 0) return -ENOMEM; - r = strv_push(x, n); - if (r < 0) { - free(n); - return -ENOMEM; - } + r = strv_consume(x, n); + if (r < 0) + return r; previous_id = name->owner_id; } -- cgit v1.2.3-54-g00ecf