cryptsetup: a few simplifications

2012-05-21 17:22:40 +02:00
parent 344de60901
commit f7f21d33db
3 changed files with 40 additions and 33 deletions
@@ -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;
                }