X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcryptsetup%2Fcryptsetup-generator.c;h=386714b4fd09e8ac67bec1f6854c9328993fa11e;hb=1c574591db5a62aa40aaac02645be1521ea85771;hp=fb6b4d25c03cdaf21042214e469a4485b0132de1;hpb=669241a076108e0483d7d8475beaa506106d077e;p=elogind.git

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index fb6b4d25c..386714b4f 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -303,8 +303,7 @@ static int parse_proc_cmdline(void) {
 
                         t = strv_append(arg_proc_cmdline_disks, word + 10);
                         if (!t) {
-                                log_error("Out of memory.");
-                                r = -ENOMEM;
+                                r = log_oom();
                                 goto finish;
                         }
                         strv_free(arg_proc_cmdline_disks);
@@ -317,8 +316,7 @@ static int parse_proc_cmdline(void) {
 
                                 t = strv_append(arg_proc_cmdline_disks, word + 13);
                                 if (!t) {
-                                        log_error("Out of memory.");
-                                        r = -ENOMEM;
+                                        r = log_oom();
                                         goto finish;
                                 }
                                 strv_free(arg_proc_cmdline_disks);
@@ -376,11 +374,11 @@ int main(int argc, char *argv[]) {
                 if (startswith(p, "luks-"))
                         p += 5;
 
-                name = strappend("luks-", *i);
-                device = strappend("UUID=", *i);
+                name = strappend("luks-", p);
+                device = strappend("UUID=", p);
 
                 if (!name || !device) {
-                        log_error("Out of memory.");
+                        log_oom();
                         r = EXIT_FAILURE;
                         free(name);
                         free(device);