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/bus-driverd/bus-driverd.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/bus-driverd/bus-driverd.c') diff --git a/src/bus-driverd/bus-driverd.c b/src/bus-driverd/bus-driverd.c index 54059604b1..3284d62534 100644 --- a/src/bus-driverd/bus-driverd.c +++ b/src/bus-driverd/bus-driverd.c @@ -562,11 +562,9 @@ static int driver_list_queued_owners(sd_bus *bus, sd_bus_message *m, void *userd if (asprintf(&n, ":1.%llu", (unsigned long long) name->owner_id) < 0) return -ENOMEM; - r = strv_push(&owners, n); - if (r < 0) { - free(n); - return -ENOMEM; - } + r = strv_consume(&owners, n); + if (r < 0) + return r; } r = ioctl(bus->input_fd, KDBUS_CMD_FREE, &cmd.offset); -- cgit v1.2.3-54-g00ecf