From: Tom Gundersen <teg@jklm.no>
Date: Fri, 10 Apr 2015 17:43:36 +0000 (+0200)
Subject: shared: efivars - is_efi_*() returns bool instead of int
X-Git-Tag: v220~490
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9df49b33583e8a7d0a252bc5bd532fd2448ef0c8;p=thirdparty%2Fsystemd.git

shared: efivars - is_efi_*() returns bool instead of int

There was a bug where is_efi_*() could return a negative error value, which would be treated as 'true',
just make this a bool in the helper library to avoid the problem.
---

diff --git a/src/shared/efivars.c b/src/shared/efivars.c
index b82f74a459e..2a925f3970a 100644
--- a/src/shared/efivars.c
+++ b/src/shared/efivars.c
@@ -87,12 +87,12 @@ static int read_flag(const char *varname) {
         return r;
 }
 
-int is_efi_secure_boot(void) {
-        return read_flag("SecureBoot");
+bool is_efi_secure_boot(void) {
+        return read_flag("SecureBoot") > 0;
 }
 
-int is_efi_secure_boot_setup_mode(void) {
-        return read_flag("SetupMode");
+bool is_efi_secure_boot_setup_mode(void) {
+        return read_flag("SetupMode") > 0;
 }
 
 int efi_reboot_to_firmware_supported(void) {
diff --git a/src/shared/efivars.h b/src/shared/efivars.h
index e796bf415dd..420013a61d1 100644
--- a/src/shared/efivars.h
+++ b/src/shared/efivars.h
@@ -33,8 +33,8 @@
 #define EFI_VARIABLE_RUNTIME_ACCESS     0x0000000000000004
 
 bool is_efi_boot(void);
-int is_efi_secure_boot(void);
-int is_efi_secure_boot_setup_mode(void);
+bool is_efi_secure_boot(void);
+bool is_efi_secure_boot_setup_mode(void);
 int efi_reboot_to_firmware_supported(void);
 int efi_get_reboot_to_firmware(void);
 int efi_set_reboot_to_firmware(bool value);