From mboxrd@z Thu Jan 1 00:00:00 1970 From: AKASHI Takahiro Date: Mon, 30 Mar 2020 15:58:05 +0900 Subject: [PATCH 1/1] efi_loader: definition of GetNextVariableName() In-Reply-To: <20200322173534.170524-1-xypron.glpk@gmx.de> References: <20200322173534.170524-1-xypron.glpk@gmx.de> Message-ID: <20200330065804.GC11504@linaro.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Sun, Mar 22, 2020 at 06:35:34PM +0100, Heinrich Schuchardt wrote: > '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 > Fixes: 0bda81bfdc5c ("efi_loader: use const efi_guid_t * for variable services") > Signed-off-by: Heinrich Schuchardt > --- > include/efi_api.h | 2 +- > include/efi_loader.h | 2 +- > lib/efi_loader/efi_variable.c | 4 ++-- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/include/efi_api.h b/include/efi_api.h > index 4713da2e1d..1c40ffc4f5 100644 > --- a/include/efi_api.h > +++ b/include/efi_api.h > @@ -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, > diff --git a/include/efi_loader.h b/include/efi_loader.h > index 37c3f15da1..3f2792892f 100644 > --- a/include/efi_loader.h > +++ b/include/efi_loader.h > @@ -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); > diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c > index 3bec2d0d17..fe2f264591 100644 > --- a/lib/efi_loader/efi_variable.c > +++ b/lib/efi_loader/efi_variable.c > @@ -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 EFIAPI > efi_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 >