efi_loader: definition of GetNextVariableName()
PATCH 1/1 efi_loader: definition of GetNextVariableName()
'vendor' is both an input and an output parameter. So it cannot be constant.
Fixes 0bda81bfdc5c ("efi_loader: use const efi_guid_t * for variable services")
Signed-off-by Heinrich Schuchardt <[email protected]>
--- include/efi_api.h | 2 +- include/efi_loader.h | 2 +- lib/efi_loader/efi_variable.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
include/efi_api.h +1 -1
@@ -272,7 +272,7 @@ struct efi_runtime_services { efi_uintn_t *data_size, void *data);efi_status_t (EFIAPI *get_next_variable_name)( efi_uintn_t *variable_name_size, - u16 *variable_name, const efi_guid_t *vendor); + u16 *variable_name, efi_guid_t *vendor); efi_status_t (EFIAPI *set_variable)(u16 *variable_name, const efi_guid_t *vendor, u32 attributes,
include/efi_loader.h +1 -1
@@ -645,7 +645,7 @@ efi_status_t EFIAPI efi_get_variable(u16 *variable_name, efi_uintn_t *data_size, void *data); efi_status_t EFIAPI efi_get_next_variable_name(efi_uintn_t *variable_name_size,u16 *variable_name, -const efi_guid_t *vendor); +efi_guid_t *vendor); efi_status_t EFIAPI efi_set_variable(u16 *variable_name,const efi_guid_t *vendor,u32 attributes,efi_uintn_t data_size,const void *data);
lib/efi_loader/efi_variable.c +2 -2
@@ -330,7 +330,7 @@ static efi_status_t parse_uboot_variable(char *variable,*/ efi_status_t EFIAPI efi_get_next_variable_name(efi_uintn_t *variable_name_size,u16 *variable_name, -const efi_guid_t *vendor) +efi_guid_t *vendor) {char *native_name, *variable;ssize_t name_len, list_len;
@@ -598,7 +598,7 @@ efi_get_variable_runtime(u16 *variable_name, const efi_guid_t *vendor,*/ static efi_status_t __efi_runtime EFIAPIefi_get_next_variable_name_runtime (efi_uintn_t *variable_name_size, -u16 *variable_name,const efi_guid_t *vendor) +u16 *variable_name,efi_guid_t *vendor) {return EFI_UNSUPPORTED ; }
--
2.25.1
PATCH 1/1 efi_loader: definition of GetNextVariableName()
Quoted 2 lines · Heinrich Schuchardt
'vendor' is both an input and an output parameter. So it cannot be constant.
The same fix must be applied to parse_uboot_variable().
-Takahiro Akashi
Quoted 59 lines
Fixes 0bda81bfdc5c ("efi_loader: use const efi_guid_t * for variable services")Signed-off-by Heinrich Schuchardt <[email protected]>--- include/efi_api.h | 2 +- include/efi_loader.h | 2 +- lib/efi_loader/efi_variable.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)include/efi_api.h +1
-1@@ -272,7 +272,7 @@ struct efi_runtime_services { efi_uintn_t *data_size, void *data);efi_status_t (EFIAPI *get_next_variable_name)( efi_uintn_t *variable_name_size, - u16 *variable_name, const efi_guid_t *vendor); + u16 *variable_name, efi_guid_t *vendor); efi_status_t (EFIAPI *set_variable)(u16 *variable_name, const efi_guid_t *vendor, u32 attributes,include/efi_loader.h +1
-1@@ -645,7 +645,7 @@ efi_status_t EFIAPI efi_get_variable(u16 *variable_name, efi_uintn_t *data_size, void *data); efi_status_t EFIAPI efi_get_next_variable_name(efi_uintn_t *variable_name_size,u16 *variable_name, -const efi_guid_t *vendor); +efi_guid_t *vendor); efi_status_t EFIAPI efi_set_variable(u16 *variable_name,const efi_guid_t *vendor,u32 attributes,efi_uintn_t data_size,const void *data);lib/efi_loader/efi_variable.c +2
-3@@ -330,7 +330,7 @@ static efi_status_t parse_uboot_variable(char *variable,*/ efi_status_t EFIAPI efi_get_next_variable_name(efi_uintn_t *variable_name_size,u16 *variable_name, -const efi_guid_t *vendor) +efi_guid_t *vendor) {char *native_name, *variable;ssize_t name_len, list_len;@@ -598,7 +598,7 @@ efi_get_variable_runtime(u16 *variable_name, const efi_guid_t *vendor,*/ static efi_status_t __efi_runtime EFIAPIefi_get_next_variable_name_runtime (efi_uintn_t *variable_name_size, -u16 *variable_name,const efi_guid_t *vendor) +u16 *variable_name,efi_guid_t *vendor) {return EFI_UNSUPPORTED ; } --2.25.1