diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-05-20 07:19:22 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-05-20 11:18:56 +0200 |
| commit | a2a7b77260b4990d60bbd7797fa427d82ee52a33 (patch) | |
| tree | e53aca1fdca3139d26493651ea08fd8540fe6c95 /src | |
| parent | env-util: use strextend() (diff) | |
| download | systemd-a2a7b77260b4990d60bbd7797fa427d82ee52a33.tar.xz systemd-a2a7b77260b4990d60bbd7797fa427d82ee52a33.zip | |
pid1: use strextend_with_separator()
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/dbus-util.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c index 44a2ccfca0..ca9b399d8c 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); |