Merge pull request #779 from poettering/fflush-and-check

tree-wide: port everything over to fflush_and_check()

1 files changed, 4 insertions, 4 deletions

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 091ea375d3..359fde9998 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -489,9 +489,9 @@ static int copy_file(const char *from, const char *to, bool force) {
                 }
         } while (!feof(f));
 
-        fflush(g);
-        if (ferror(g)) {
-                r = log_error_errno(EIO, "Failed to write \"%s\": %m", to);
+        r = fflush_and_check(g);
+        if (r < 0) {
+                log_error_errno(r, "Failed to write \"%s\": %m", to);
                 goto error;
         }
 
@@ -519,7 +519,7 @@ static int copy_file(const char *from, const char *to, bool force) {
         return 0;
 
 error:
-        unlink(p);
+        (void) unlink(p);
         return r;
 }