From: Djalal Harouni <tixxdz@opendz.org>
Date: Tue, 17 Dec 2013 18:42:00 +0000 (+0100)
Subject: loginctl: replace strv_append() by strv_extend()
X-Git-Tag: v209~804
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=1c3051eba4f2a3cbb8417f8d2e11699a67987700

loginctl: replace strv_append() by strv_extend()
---

diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index f96a56861..e03b0b93e 100644
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -1089,7 +1089,7 @@ static int parse_argv(int argc, char *argv[]) {
                 {}
         };
 
-        int c;
+        int c, r;
 
         assert(argc >= 0);
         assert(argv);
@@ -1107,14 +1107,9 @@ static int parse_argv(int argc, char *argv[]) {
                         return 0;
 
                 case 'p': {
-                        char **l;
-
-                        l = strv_append(arg_property, optarg);
-                        if (!l)
-                                return -ENOMEM;
-
-                        strv_free(arg_property);
-                        arg_property = l;
+                        r = strv_extend(&arg_property, optarg);
+                        if (r < 0)
+                                return log_oom();
 
                         /* If the user asked for a particular
                          * property, show it to him, even if it is