From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 20 May 2021 05:19:22 +0000 (+0900)
Subject: pid1: use strextend_with_separator()
X-Git-Tag: v249-rc1~182^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a2a7b77260b4990d60bbd7797fa427d82ee52a33;p=thirdparty%2Fsystemd.git

pid1: use strextend_with_separator()
---

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);