wrap a few *_FOREACH macros in curly braces

[elogind.git] / src / random-seed / random-seed.c

diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c
index 90ec8af7b83967f28298c40b41c51fc62f8213f8..06c12396017843629ffcc100586f9122f9f3bd93 100644 (file)
--- a/src/random-seed/random-seed.c
+++ b/src/random-seed/random-seed.c
@@ -72,7 +72,7 @@ int main(int argc, char *argv[]) {
 
         r = mkdir_parents_label(RANDOM_SEED, 0755);
         if (r < 0) {
-                log_error_errno(-r, "Failed to create directory " RANDOM_SEED_DIR ": %m");
+                log_error_errno(r, "Failed to create directory " RANDOM_SEED_DIR ": %m");
                 goto finish;
         }
 
@@ -86,7 +86,7 @@ int main(int argc, char *argv[]) {
                 if (seed_fd < 0) {
                         seed_fd = open(RANDOM_SEED, O_RDONLY|O_CLOEXEC|O_NOCTTY);
                         if (seed_fd < 0) {
-                                log_error("Failed to open " RANDOM_SEED ": %m");
+                                log_error_errno(errno, "Failed to open " RANDOM_SEED ": %m");
                                 r = -errno;
                                 goto finish;
                         }
@@ -96,7 +96,7 @@ int main(int argc, char *argv[]) {
                 if (random_fd < 0) {
                         random_fd = open("/dev/urandom", O_WRONLY|O_CLOEXEC|O_NOCTTY, 0600);
                         if (random_fd < 0) {
-                                log_error("Failed to open /dev/urandom: %m");
+                                log_error_errno(errno, "Failed to open /dev/urandom: %m");
                                 r = -errno;
                                 goto finish;
                         }
@@ -106,33 +106,30 @@ int main(int argc, char *argv[]) {
                 if (k <= 0) {
 
                         if (r != 0)
-                                log_error("Failed to read seed from " RANDOM_SEED ": %m");
+                                log_error_errno(errno, "Failed to read seed from " RANDOM_SEED ": %m");
 
                         r = k == 0 ? -EIO : (int) k;
 
                 } else {
                         lseek(seed_fd, 0, SEEK_SET);
 
-                        k = loop_write(random_fd, buf, (size_t) k, false);
-                        if (k <= 0) {
-                                log_error("Failed to write seed to /dev/urandom: %s", r < 0 ? strerror(-r) : "short write");
-
-                                r = k == 0 ? -EIO : (int) k;
-                        }
+                        r = loop_write(random_fd, buf, (size_t) k, false);
+                        if (r < 0)
+                                log_error_errno(r, "Failed to write seed to /dev/urandom: %m");
                 }
 
         } else if (streq(argv[1], "save")) {
 
                 seed_fd = open(RANDOM_SEED, O_WRONLY|O_CLOEXEC|O_NOCTTY|O_CREAT, 0600);
                 if (seed_fd < 0) {
-                        log_error("Failed to open " RANDOM_SEED ": %m");
+                        log_error_errno(errno, "Failed to open " RANDOM_SEED ": %m");
                         r = -errno;
                         goto finish;
                 }
 
                 random_fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC|O_NOCTTY);
                 if (random_fd < 0) {
-                        log_error("Failed to open /dev/urandom: %m");
+                        log_error_errno(errno, "Failed to open /dev/urandom: %m");
                         r = -errno;
                         goto finish;
                 }
@@ -155,10 +152,8 @@ int main(int argc, char *argv[]) {
                 r = k == 0 ? -EIO : (int) k;
         } else {
                 r = loop_write(seed_fd, buf, (size_t) k, false);
-                if (r <= 0) {
-                        log_error("Failed to write new random seed file: %s", r < 0 ? strerror(-r) : "short write");
-                        r = r == 0 ? -EIO : r;
-                }
+                if (r < 0)
+                        log_error_errno(r, "Failed to write new random seed file: %m");
         }
 
 finish: