From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 25 Jun 2018 16:18:20 +0000 (+0200)
Subject: efi: make efivar_set_raw() buffer argument VOID*
X-Git-Tag: v240~522^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f82ecab0a9c4c1ef5f43bdee98f128c3a0ee611c;p=thirdparty%2Fsystemd.git

efi: make efivar_set_raw() buffer argument VOID*

No need to define a type if it is just some arbitrary buffer for us
anyway.
---

diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
index 909dad69b12..02c46c44c2e 100644
--- a/src/boot/efi/boot.c
+++ b/src/boot/efi/boot.c
@@ -2007,7 +2007,7 @@ static EFI_STATUS reboot_into_firmware(VOID) {
         if (!EFI_ERROR(err))
                 osind |= (UINT64)*b;
 
-        err = efivar_set_raw(&global_guid, L"OsIndications", (CHAR8 *)&osind, sizeof(UINT64), TRUE);
+        err = efivar_set_raw(&global_guid, L"OsIndications", &osind, sizeof(UINT64), TRUE);
         if (EFI_ERROR(err))
                 return err;
 
diff --git a/src/boot/efi/util.c b/src/boot/efi/util.c
index c75e970b03d..e286b14bcc6 100644
--- a/src/boot/efi/util.c
+++ b/src/boot/efi/util.c
@@ -79,7 +79,7 @@ EFI_STATUS parse_boolean(CHAR8 *v, BOOLEAN *b) {
         return EFI_INVALID_PARAMETER;
 }
 
-EFI_STATUS efivar_set_raw(const EFI_GUID *vendor, CHAR16 *name, CHAR8 *buf, UINTN size, BOOLEAN persistent) {
+EFI_STATUS efivar_set_raw(const EFI_GUID *vendor, CHAR16 *name, VOID *buf, UINTN size, BOOLEAN persistent) {
         UINT32 flags;
 
         flags = EFI_VARIABLE_BOOTSERVICE_ACCESS|EFI_VARIABLE_RUNTIME_ACCESS;
@@ -90,7 +90,7 @@ EFI_STATUS efivar_set_raw(const EFI_GUID *vendor, CHAR16 *name, CHAR8 *buf, UINT
 }
 
 EFI_STATUS efivar_set(CHAR16 *name, CHAR16 *value, BOOLEAN persistent) {
-        return efivar_set_raw(&loader_guid, name, (CHAR8 *)value, value ? (StrLen(value)+1) * sizeof(CHAR16) : 0, persistent);
+        return efivar_set_raw(&loader_guid, name, value, value ? (StrLen(value)+1) * sizeof(CHAR16) : 0, persistent);
 }
 
 EFI_STATUS efivar_set_int(CHAR16 *name, UINTN i, BOOLEAN persistent) {
diff --git a/src/boot/efi/util.h b/src/boot/efi/util.h
index 9921e8bc0a5..ae064440142 100644
--- a/src/boot/efi/util.h
+++ b/src/boot/efi/util.h
@@ -18,7 +18,7 @@ UINT64 ticks_freq(void);
 UINT64 time_usec(void);
 
 EFI_STATUS efivar_set(CHAR16 *name, CHAR16 *value, BOOLEAN persistent);
-EFI_STATUS efivar_set_raw(const EFI_GUID *vendor, CHAR16 *name, CHAR8 *buf, UINTN size, BOOLEAN persistent);
+EFI_STATUS efivar_set_raw(const EFI_GUID *vendor, CHAR16 *name, VOID *buf, UINTN size, BOOLEAN persistent);
 EFI_STATUS efivar_set_int(CHAR16 *name, UINTN i, BOOLEAN persistent);
 VOID efivar_set_time_usec(CHAR16 *name, UINT64 usec);