Fix compilation without EFI being enabled
authorVesa Jääskeläinen <vesa.jaaskelainen@vaisala.com>
Sat, 9 Mar 2019 20:44:21 +0000 (22:44 +0200)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 11 Mar 2019 01:48:49 +0000 (10:48 +0900)
If EFI is disabled compilation can fail with:

../src/login/logind-dbus.c: In function ‘property_get_reboot_to_boot_loader_entry’:
../src/login/logind-dbus.c:2772:29: error: implicit declaration of function ‘efi_loader_entry_name_valid’; did you mean ‘efi_loader_get_features’? [-Werror=implicit-function-declaration]
                 } else if (!efi_loader_entry_name_valid(v)) {
                             ^~~~~~~~~~~~~~~~~~~~~~~~~~~
                             efi_loader_get_features
../src/login/logind-dbus.c:2772:29: warning: nested extern declaration of ‘efi_loader_entry_name_valid’ [-Wnested-externs]

This adds stub for efi_loader_entry_name_valid() to enable compilation.

src/shared/efivars.h

index 92670c8..a545cd4 100644 (file)
@@ -132,6 +132,10 @@ static inline int efi_loader_get_entries(char ***ret) {
         return -EOPNOTSUPP;
 }
 
+static inline bool efi_loader_entry_name_valid(const char *s) {
+        return false;
+}
+
 static inline int efi_loader_get_features(uint64_t *ret) {
         return -EOPNOTSUPP;
 }