From f7f21d33db5dfe88dc8175c61dada44013347729 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 21 May 2012 17:22:36 +0200
Subject: cryptsetup: a few simplifications

---
 src/core/mount.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/core')

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;
                 }
-- 
cgit v1.2.3-54-g00ecf