From a2a7b77260b4990d60bbd7797fa427d82ee52a33 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 20 May 2021 14:19:22 +0900 Subject: [PATCH] pid1: use strextend_with_separator() --- src/core/dbus-util.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c index 44a2ccfca06..ca9b399d8c9 100644 --- a/src/core/dbus-util.c +++ b/src/core/dbus-util.c @@ -181,7 +181,7 @@ int bus_read_mount_options( return r; while ((r = sd_bus_message_read(message, "(ss)", &partition, &mount_options)) > 0) { - _cleanup_free_ char *previous = NULL, *escaped = NULL; + _cleanup_free_ char *escaped = NULL; _cleanup_free_ MountOptions *o = NULL; PartitionDesignator partition_designator; @@ -198,9 +198,7 @@ int bus_read_mount_options( if (!escaped) return -ENOMEM; - previous = TAKE_PTR(format_str); - format_str = strjoin(previous, previous ? separator : "", partition, ":", escaped); - if (!format_str) + if (!strextend_with_separator(&format_str, separator, partition, ":", escaped)) return -ENOMEM; o = new(MountOptions, 1); -- 2.47.3