Promote efi_guid_cmp() and friends to not be inlined.

Some compilers seem to get confused with the current efi_guid_cmp() invocation, so just make it real API. Signed-off-by: Peter Jones <[email protected]>
rhboot · Jun 30, 2016 · 4af5b56 · 4af5b56
1 parent 199fbf8
commit 4af5b56
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 21 deletions.
diff --git a/src/guid.c b/src/guid.c
@@ -27,6 +27,28 @@
 
 #define GUID_LENGTH_WITH_NUL 37
 
+int
+__attribute__((__nonnull__ (1, 2)))
+__attribute__((__visibility__ ("default")))
+efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b)
+{
+	return memcmp(a, b, sizeof (efi_guid_t));
+}
+
+int
+__attribute__((__nonnull__ (1)))
+__attribute__((__visibility__ ("default")))
+efi_guid_is_zero(const efi_guid_t *guid)
+{
+	return !efi_guid_cmp(guid,&efi_guid_zero);
+}
+
+int
+efi_guid_is_empty(const efi_guid_t *guid)
+__attribute__((__nonnull__ (1)))
+__attribute__((__visibility__ ("default")))
+__attribute__ ((weak, alias ("efi_guid_is_zero")));
+
 int
 __attribute__((__nonnull__ (1, 2)))
 __attribute__((__visibility__ ("default")))

diff --git a/src/include/efivar/efivar.h b/src/include/efivar/efivar.h
@@ -105,29 +105,11 @@ extern int efi_id_guid_to_guid(const char *name, efi_guid_t *guid)
 extern int efi_symbol_to_guid(const char *symbol, efi_guid_t *guid)
 			     __attribute__((__nonnull__ (1, 2)));
 
-static inline int
-__attribute__ ((unused))
-__attribute__((__nonnull__ (1, 2)))
-efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b)
-{
-	return memcmp(a, b, sizeof (efi_guid_t));
-}
-
 extern const efi_guid_t efi_guid_zero;
 
-inline int
-__attribute__ ((unused))
-__attribute__((__nonnull__ (1)))
-efi_guid_is_zero(const efi_guid_t *guid)
-{
-	return !efi_guid_cmp(guid,&efi_guid_zero);
-}
-extern int
-efi_guid_is_empty(const efi_guid_t *guid)
-__attribute__ ((unused))
-__attribute__((__nonnull__ (1)))
-__attribute__((__visibility__ ("default")))
-__attribute__ ((weak, alias ("efi_guid_is_zero")));
+extern int efi_guid_is_zero(const efi_guid_t *guid);
+extern int efi_guid_is_empty(const efi_guid_t *guid);
+extern int efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b);
 
 /* import / export functions */
 typedef struct efi_variable efi_variable_t;

diff --git a/src/libefivar.map b/src/libefivar.map
@@ -96,4 +96,5 @@ LIBEFIVAR_0.0 {
 
 LIBEFIVAR_0.24 {
 	global: efi_set_variable;
+		efi_guid_cmp;
 } LIBEFIVAR_0.0;