treewide: more log_*_errno + return simplifications

[elogind.git] / src / cryptsetup / cryptsetup-generator.c

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 05ceff443fe1dc80529dd6452230e77de472a28d..c281001e7428e8594fad9b73be4a6d3beeaf4d5c 100644 (file)
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -254,10 +254,8 @@ static int create_disk(
                 r = write_drop_in(arg_dest, dmname, 90, "device-timeout",
                                   "# Automatically generated by systemd-cryptsetup-generator \n\n"
                                   "[Unit]\nJobTimeoutSec=0");
-                if (r < 0) {
-                        log_error("Failed to write device drop-in: %s", strerror(-r));
-                        return r;
-                }
+                if (r < 0)
+                        return log_error_errno(r, "Failed to write device drop-in: %m");
         }
 
         return 0;
@@ -308,7 +306,7 @@ int main(int argc, char *argv[]) {
         _cleanup_strv_free_ char **disks_done = NULL;
         _cleanup_fclose_ FILE *f = NULL;
         unsigned n = 0;
-        int r = EXIT_FAILURE, r2 = EXIT_FAILURE;
+        int r = EXIT_FAILURE, r2 = EXIT_FAILURE, z;
         char **i;
 
         if (argc > 1 && argc != 4) {
@@ -325,8 +323,9 @@ int main(int argc, char *argv[]) {
 
         umask(0022);
 
-        if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
-                goto cleanup;
+        z = parse_proc_cmdline(parse_proc_cmdline_item);
+        if (z < 0)
+                log_warning_errno(z, "Failed to parse kernel command line, ignoring: %m");
 
         if (!arg_enabled) {
                 r = r2 = EXIT_SUCCESS;
@@ -381,7 +380,7 @@ int main(int argc, char *argv[]) {
                         }
 
                         /*
-                          If options are specified on the kernel commandline, let them override
+                          If options are specified on the kernel command line, let them override
                           the ones from crypttab.
                         */
                         STRV_FOREACH(i, arg_options) {
@@ -463,7 +462,7 @@ next:
 
                 if (arg_options) {
                         /*
-                          If options are specified on the kernel commandline, use them.
+                          If options are specified on the kernel command line, use them.
                         */
                         char **j;