]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
systemctl: simplify machine_info_clear
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 25 Jul 2016 16:21:50 +0000 (12:21 -0400)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 25 Jul 2016 17:51:34 +0000 (13:51 -0400)
It is only used with info allocated on the stack, so the pointer cannot be
NULL.

src/systemctl/systemctl.c

index d4ec1da2902b4f09ac1c974db6994efb10c32043..44a3708a62a15e3f83166d97595e59f99adedb55 100644 (file)
@@ -1835,12 +1835,12 @@ static const struct bus_properties_map machine_info_property_map[] = {
 };
 
 static void machine_info_clear(struct machine_info *info) {
-        if (info) {
-                free(info->name);
-                free(info->state);
-                free(info->control_group);
-                zero(*info);
-        }
+        assert(info);
+
+        free(info->name);
+        free(info->state);
+        free(info->control_group);
+        zero(*info);
 }
 
 static void free_machines_list(struct machine_info *machine_infos, int n) {