summaryrefslogtreecommitdiff
path: root/mok.c
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2021-02-22 12:03:53 -0500
committerPeter Jones <pjones@redhat.com>2021-02-25 10:15:14 -0500
commitc1722924cee57e1eb27cad656baf079bf809b8f6 (patch)
tree2a198b1a1a4ae7355dc267d62beb601ed339d01d /mok.c
parentd27c33b2fa544f89433e99f92122d21eaa06861d (diff)
downloadefi-boot-shim-c1722924cee57e1eb27cad656baf079bf809b8f6.tar.gz
efi-boot-shim-c1722924cee57e1eb27cad656baf079bf809b8f6.zip
compiler.h: fix a typo and add some more function attribute macros
This fixes the ifndef guard on NONNULL and __CONCAT3 and adds definitions for: - __CONCAT() for a##b with the intermediate tokenization step - ALLOCFUNC for __malloc__ - DEPRECATED for __deprecated__ - PURE for __pure__ - RETURNS_NONNULL for __nonnull__ Signed-off-by: Peter Jones <pjones@redhat.com>
Diffstat (limited to 'mok.c')
-rw-r--r--mok.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mok.c b/mok.c
index 4b935a49..ac0276ec 100644
--- a/mok.c
+++ b/mok.c
@@ -250,7 +250,7 @@ struct mok_state_variable mok_state_variables[] = {
#define should_mirror_addend(v) (((v)->categorize_addend) && ((v)->categorize_addend(v) != VENDOR_ADDEND_NONE))
-static inline BOOLEAN nonnull(1)
+static inline BOOLEAN NONNULL(1)
should_mirror_build_cert(struct mok_state_variable *v)
{
return (v->build_cert && v->build_cert_size &&
@@ -530,7 +530,7 @@ mirror_mok_db(CHAR16 *name, CHAR8 *name8, EFI_GUID *guid, UINT32 attrs,
}
-static EFI_STATUS nonnull(1)
+static EFI_STATUS NONNULL(1)
mirror_one_mok_variable(struct mok_state_variable *v,
BOOLEAN only_first)
{
@@ -840,7 +840,7 @@ mirror_one_mok_variable(struct mok_state_variable *v,
* Mirror a variable if it has an rtname, and preserve any
* EFI_SECURITY_VIOLATION status at the same time.
*/
-static EFI_STATUS nonnull(1)
+static EFI_STATUS NONNULL(1)
maybe_mirror_one_mok_variable(struct mok_state_variable *v,
EFI_STATUS ret, BOOLEAN only_first)
{