From 6e18964d3a365567954fe10ddcfad74babdc427c Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
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/login/logind-user-dbus.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/login/logind-user-dbus.c')

diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c
index 18eea89701..b5d27e74de 100644
--- a/src/login/logind-user-dbus.c
+++ b/src/login/logind-user-dbus.c
@@ -315,11 +315,9 @@ int user_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***
                 if (!p)
                         return -ENOMEM;
 
-                r = strv_push(&l, p);
-                if (r < 0) {
-                        free(p);
+                r = strv_consume(&l, p);
+                if (r < 0)
                         return r;
-                }
         }
 
         *nodes = l;
-- 
cgit v1.2.3-54-g00ecf