]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
dissect-image: simplify things by avoiding one string copy
authorLennart Poettering <lennart@poettering.net>
Wed, 21 Dec 2022 11:25:32 +0000 (12:25 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 23 Dec 2022 11:42:37 +0000 (12:42 +0100)
We don't need the node in its original variable anymore, hence let's
just move it over instead of allocating a copy.

src/shared/dissect-image.c

index 100b8cc8f147baccae30a32bbe550313efe3ef3a..20f35c6d4a90fa70d5d1a1ffdb7d42d4087becfd 100644 (file)
@@ -862,9 +862,7 @@ static int dissect_image(
                                         generic_rw = !(pflags & SD_GPT_FLAG_READ_ONLY);
                                         generic_growfs = FLAGS_SET(pflags, SD_GPT_FLAG_GROWFS);
                                         generic_uuid = id;
-                                        generic_node = strdup(node);
-                                        if (!generic_node)
-                                                return -ENOMEM;
+                                        generic_node = TAKE_PTR(node);
                                 }
 
                         } else if (type.designator == PARTITION_VAR) {
@@ -982,9 +980,7 @@ static int dissect_image(
                                         generic_nr = nr;
                                         generic_rw = true;
                                         generic_growfs = false;
-                                        generic_node = strdup(node);
-                                        if (!generic_node)
-                                                return -ENOMEM;
+                                        generic_node = TAKE_PTR(node);
                                 }
 
                                 break;