On 4/27/19 2:53 AM, Laszlo Ersek wrote: > The GetExact(), GetSettings(), PrintSettings() functions are only called > from within "EnrollDefaultKeys.c", and none of them take variable > arguments. Drop their EFIAPI calling convention specifiers. > > Cc: Anthony Perard <[email protected]> > Cc: Ard Biesheuvel <[email protected]> > Cc: Jordan Justen <[email protected]> > Cc: Julien Grall <[email protected]> > Bugzilla: https://bugzilla.tianocore.org/show_bug.cgi?id=1747 > Signed-off-by: Laszlo Ersek <[email protected]> > --- > OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c > b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c > index be0e4d8f8e96..671efef8d6ad 100644 > --- a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c > +++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c > @@ -806,17 +806,16 @@ Out: > VendorGuid, Status); > } > return Status; > } > > > STATIC > EFI_STATUS > -EFIAPI > GetExact ( > IN CHAR16 *VariableName, > IN EFI_GUID *VendorGuid, > OUT VOID *Data, > IN UINTN DataSize, > IN BOOLEAN AllowMissing > ) > { > @@ -850,17 +849,16 @@ typedef struct { > UINT8 SecureBoot; > UINT8 SecureBootEnable; > UINT8 CustomMode; > UINT8 VendorKeys; > } SETTINGS; > > STATIC > EFI_STATUS > -EFIAPI > GetSettings ( > OUT SETTINGS *Settings > ) > { > EFI_STATUS Status; > > Status = GetExact (EFI_SETUP_MODE_NAME, &gEfiGlobalVariableGuid, > &Settings->SetupMode, sizeof Settings->SetupMode, FALSE); > @@ -889,17 +887,16 @@ GetSettings ( > > Status = GetExact (EFI_VENDOR_KEYS_VARIABLE_NAME, &gEfiGlobalVariableGuid, > &Settings->VendorKeys, sizeof Settings->VendorKeys, FALSE); > return Status; > } > > STATIC > VOID > -EFIAPI > PrintSettings ( > IN CONST SETTINGS *Settings > ) > { > AsciiPrint ("info: SetupMode=%d SecureBoot=%d SecureBootEnable=%d " > "CustomMode=%d VendorKeys=%d\n", Settings->SetupMode, > Settings->SecureBoot, > Settings->SecureBootEnable, Settings->CustomMode, Settings->VendorKeys); > } >
Reviewed-by: Philippe Mathieu-Daude <[email protected]> -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39766): https://edk2.groups.io/g/devel/message/39766 Mute This Topic: https://groups.io/mt/31359378/21656 Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
