From 9dccc6d3aeb81ce319c901d66d6dce7a8314eab3 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 15 Mar 2019 10:42:46 +0100 Subject: [PATCH] systemctl: use strv_consume() where we can --- src/systemctl/systemctl.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 637985bcda..dd51b1912e 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -8073,10 +8073,8 @@ static int systemctl_parse_argv(int argc, char *argv[]) { if (r == 0) break; - if (strv_push(&arg_properties, prop) < 0) + if (strv_consume(&arg_properties, TAKE_PTR(prop)) < 0) return log_oom(); - - prop = NULL; } } @@ -8302,10 +8300,8 @@ static int systemctl_parse_argv(int argc, char *argv[]) { return 0; } - if (strv_push(&arg_states, s) < 0) + if (strv_consume(&arg_states, TAKE_PTR(s)) < 0) return log_oom(); - - s = NULL; } break; }