diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-05-21 17:22:36 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-05-21 17:22:40 +0200 |
| commit | f7f21d33db5dfe88dc8175c61dada44013347729 (patch) | |
| tree | 060c0ecffa0c22d85a38ebff0f4bab949d46d101 /src/core/mount.c | |
| parent | 344de60901f0e3ce0d2f112b7be97fc6d0e2f071 (diff) | |
cryptsetup: a few simplifications
Diffstat (limited to 'src/core/mount.c')
| -rw-r--r-- | src/core/mount.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/mount.c b/src/core/mount.c index aa81cc6ed7..0c62e8835a 100644 --- 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; } |