]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
systemctl: use strv_consume() where we can 12052/head
authorLennart Poettering <lennart@poettering.net>
Fri, 15 Mar 2019 09:42:46 +0000 (10:42 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 20 Mar 2019 13:53:07 +0000 (14:53 +0100)
src/systemctl/systemctl.c

index 637985bcda210f6cdbfb6e1996f43714c2d6e50c..dd51b1912e56ae5f0d602ed6e8debdf3237f0207 100644 (file)
@@ -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;
                 }