From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 19 Jul 2016 18:46:17 +0000 (+0200)
Subject: bootctl: clean up get_file_version()
X-Git-Tag: v232~368^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db6d9faeb0179b15cf29e87bd20d29d6210142ef;p=thirdparty%2Fsystemd.git

bootctl: clean up get_file_version()

Make sure that we always initialize the return parameter on success, and that
all errors result in an error message, not just some.
---

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 9a24ecd6b29..ff14cff1664 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -275,14 +275,16 @@ static int get_file_version(int fd, char **v) {
         assert(v);
 
         if (fstat(fd, &st) < 0)
-                return -errno;
+                return log_error_errno(errno, "Failed to stat EFI binary: %m");
 
-        if (st.st_size < 27)
+        if (st.st_size < 27) {
+                *v = NULL;
                 return 0;
+        }
 
         buf = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
         if (buf == MAP_FAILED)
-                return -errno;
+                return log_error_errno(errno, "Failed to memory map EFI binary: %m");
 
         s = memmem(buf, st.st_size - 8, "#### LoaderInfo: ", 17);
         if (!s)
@@ -304,7 +306,7 @@ static int get_file_version(int fd, char **v) {
         r = 1;
 
 finish:
-        munmap(buf, st.st_size);
+        (void) munmap(buf, st.st_size);
         *v = x;
         return r;
 }