From 1c3051eba4f2a3cbb8417f8d2e11699a67987700 Mon Sep 17 00:00:00 2001 From: Djalal Harouni Date: Tue, 17 Dec 2013 19:42:00 +0100 Subject: [PATCH] loginctl: replace strv_append() by strv_extend() --- src/login/loginctl.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/login/loginctl.c b/src/login/loginctl.c index f96a568..e03b0b9 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 -- 2.7.4