From a559088671cd7d98417913496318d97b954b8ba1 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 21 Dec 2022 12:25:32 +0100 Subject: [PATCH] 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. --- src/shared/dissect-image.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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; -- 2.47.3