chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
cryptsetup: a few simplifications
[elogind.git]
/
src
/
core
/
mount.c
diff --git
a/src/core/mount.c
b/src/core/mount.c
index aa81cc6ed7cbc698f9f5f5421a9416a846f0685b..0c62e8835a9b23150c63dcdeadd42ec66eb21660 100644
(file)
--- a/
src/core/mount.c
+++ b/
src/core/mount.c
@@
-1647,7
+1647,8
@@
static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
goto clean_up;
}
- if (asprintf(&o, "%s,%s", options, options2) < 0) {
+ o = join(options, ",", options2, NULL);
+ if (!o) {
r = -ENOMEM;
goto finish;
}