summaryrefslogtreecommitdiffstats
path: root/src/shared/fstab-util.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-03-10 13:35:26 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-03-11 09:19:54 +0100
commit5fa2da125157a1beca508792ee5d9be833c2c0cb (patch)
treea0f2c7c340f5e12430140e9921f005ef637ca5f0 /src/shared/fstab-util.c
parentgenerators: warn but ignore failure to write timeouts (diff)
downloadsystemd-5fa2da125157a1beca508792ee5d9be833c2c0cb.tar.xz
systemd-5fa2da125157a1beca508792ee5d9be833c2c0cb.zip
shared/fstab-util: immediately drop empty options again
In the conversion from strv_split() to strv_split_full() done in 7bb553bb98a57b4e03804f8192bdc5a534325582, EXTRACT_DONT_COALESCE_SEPARATORS was added. I think this was just by mistake… We never look for "empty options", so whether we immediately ignore the extra separator or store the empty string in strv, should make no difference.
Diffstat (limited to 'src/shared/fstab-util.c')
-rw-r--r--src/shared/fstab-util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index 292b97cd69..1ddcd371cf 100644
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -140,7 +140,7 @@ int fstab_filter_options(const char *opts, const char *names,
break;
}
} else {
- r = strv_split_full(&stor, opts, ",", EXTRACT_DONT_COALESCE_SEPARATORS | EXTRACT_UNESCAPE_SEPARATORS);
+ r = strv_split_full(&stor, opts, ",", EXTRACT_UNESCAPE_SEPARATORS);
if (r < 0)
return r;