From ff890cf45224926574eee93b0ea1494468870bd3 Mon Sep 17 00:00:00 2001

From: Peter Jones <pjones@redhat.com>

Date: Thu, 31 Jan 2019 14:04:57 -0500

Subject: [PATCH 25/62] mok: minor cleanups

Signed-off-by: Peter Jones <pjones@redhat.com>

Upstream-commit-id: 617b9007668

---

 mok.c | 7 +++++--

 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mok.c b/mok.c

index 6150d8c8868..59630e74425 100644

--- a/mok.c

+++ b/mok.c

@@ -138,13 +138,16 @@ struct mok_state_variable mok_state_variables[] = {

 	{ NULL, }

 };

-inline BOOLEAN check_vendor_cert(struct mok_state_variable *v)

+static inline BOOLEAN nonnull(1)

+check_vendor_cert(struct mok_state_variable *v)

 {

 	return (v->addend_source && v->addend_size &&

 		*v->addend_source && *v->addend_size) ? TRUE : FALSE;

 }

+

 #if defined(ENABLE_SHIM_CERT)

-inline BOOLEAN check_build_cert(struct mok_state_variable *v)

+static inline BOOLEAN nonnull(1)

+check_build_cert(struct mok_state_variable *v)

 {

 	return (v->build_cert && v->build_cert_size &&

 		*v->build_cert && *v->build_cert_size) ? TRUE : FALSE;

-- 

2.26.2