From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 21 Dec 2022 11:25:32 +0000 (+0100)
Subject: dissect-image: simplify things by avoiding one string copy
X-Git-Tag: v253-rc1~220^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a559088671cd7d98417913496318d97b954b8ba1;p=thirdparty%2Fsystemd.git

dissect-image: simplify things by avoiding one string copy

We don't need the node in its original variable anymore, hence let's
just move it over instead of allocating a copy.
---

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 100b8cc8f14..20f35c6d4a9 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -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;