X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcryptsetup%2Fcryptsetup-generator.c;h=45c23bb323072aee38644463ecb4d2d498416fdd;hp=7c79ca35615fbdcc6e081079e9d92ef3ee456b3f;hb=82b1412852b70d240a2a7b6ffd134776bd246642;hpb=b5884878a2874447b2a9f07f324a7cd909d96d48

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 7c79ca356..45c23bb32 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -116,10 +116,8 @@ static int create_disk(
                 return log_oom();
 
         f = fopen(p, "wxe");
-        if (!f) {
-                log_error("Failed to create unit file %s: %m", p);
-                return -errno;
-        }
+        if (!f)
+                return log_error_errno(errno, "Failed to create unit file %s: %m", p);
 
         fputs(
                 "# Automatically generated by systemd-cryptsetup-generator\n\n"
@@ -200,10 +198,8 @@ static int create_disk(
                         name);
 
         fflush(f);
-        if (ferror(f)) {
-                log_error("Failed to write file %s: %m", p);
-                return -errno;
-        }
+        if (ferror(f))
+                return log_error_errno(errno, "Failed to write file %s: %m", p);
 
         from = strappenda("../", n);
 
@@ -214,10 +210,8 @@ static int create_disk(
                         return log_oom();
 
                 mkdir_parents_label(to, 0755);
-                if (symlink(from, to) < 0) {
-                        log_error("Failed to create symlink %s: %m", to);
-                        return -errno;
-                }
+                if (symlink(from, to) < 0)
+                        return log_error_errno(errno, "Failed to create symlink %s: %m", to);
 
                 free(to);
                 if (!nofail)
@@ -228,10 +222,8 @@ static int create_disk(
                         return log_oom();
 
                 mkdir_parents_label(to, 0755);
-                if (symlink(from, to) < 0) {
-                        log_error("Failed to create symlink %s: %m", to);
-                        return -errno;
-                }
+                if (symlink(from, to) < 0)
+                        return log_error_errno(errno, "Failed to create symlink %s: %m", to);
         }
 
         free(to);
@@ -240,10 +232,8 @@ static int create_disk(
                 return log_oom();
 
         mkdir_parents_label(to, 0755);
-        if (symlink(from, to) < 0) {
-                log_error("Failed to create symlink %s: %m", to);
-                return -errno;
-        }
+        if (symlink(from, to) < 0)
+                return log_error_errno(errno, "Failed to create symlink %s: %m", to);
 
         if (!noauto && !nofail) {
                 _cleanup_free_ char *dmname;
@@ -254,10 +244,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;
@@ -327,7 +315,7 @@ int main(int argc, char *argv[]) {
 
         z = parse_proc_cmdline(parse_proc_cmdline_item);
         if (z < 0)
-                log_warning("Failed to parse kernel command line, ignoring: %s", strerror(-z));
+                log_warning_errno(z, "Failed to parse kernel command line, ignoring: %m");
 
         if (!arg_enabled) {
                 r = r2 = EXIT_SUCCESS;
@@ -344,13 +332,13 @@ int main(int argc, char *argv[]) {
                         if (errno == ENOENT)
                                 r = EXIT_SUCCESS;
                         else
-                                log_error("Failed to open /etc/crypttab: %m");
+                                log_error_errno(errno, "Failed to open /etc/crypttab: %m");
 
                         goto next;
                 }
 
                 if (fstat(fileno(f), &st) < 0) {
-                        log_error("Failed to stat /etc/crypttab: %m");
+                        log_error_errno(errno, "Failed to stat /etc/crypttab: %m");
                         goto next;
                 }