Make some utility functions and types public

Make read_u16 and read_order available to call outside efibootmgr.c. Make var_entry_t public to be used by other source files. Prepare efibootmgr for JSON output support by making required utility functions and types publicly available to other source files. Signed-off-by: Jose M. Guisado <[email protected]>
rhboot · Feb 9, 2024 · 065f762 · 065f762
1 parent 0ca99d4
commit 065f762
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/src/efibootmgr.c b/src/efibootmgr.c
@@ -51,7 +51,6 @@
 #include <efiboot.h>
 #include <inttypes.h>
 
-#include "list.h"
 #include "efi.h"
 #include "parse_loader_data.h"
 #include "efibootmgr.h"
@@ -63,16 +62,6 @@
 
 int verbose;
 
-typedef struct _var_entry {
-	char		*name;
-	efi_guid_t	guid;
-	uint8_t		*data;
-	size_t		data_size;
-	uint32_t	attributes;
-	uint16_t	num;
-	list_t		list;
-} var_entry_t;
-
 /* global variables */
 static	LIST_HEAD(entry_list);
 static	LIST_HEAD(blk_list);
@@ -348,7 +337,7 @@ make_var(const char *prefix, list_t *var_list)
 	return NULL;
 }
 
-static int
+int
 read_order(const char *name, var_entry_t **order)
 {
 	int rc;
@@ -548,7 +537,7 @@ remove_from_order(const char *name, uint16_t num)
 	return rc;
 }
 
-static int
+int
 read_u16(const char *name)
 {
 	efi_guid_t guid = EFI_GLOBAL_GUID;

diff --git a/src/include/efibootmgr.h b/src/include/efibootmgr.h
@@ -36,6 +36,8 @@
 #define EFIBOOTMGR_PATH_ABBREV_NONE		3
 #define EFIBOOTMGR_PATH_ABBREV_FILE		4
 
+#include "list.h"
+
 typedef enum {
 	boot,
 	driver,
@@ -98,6 +100,19 @@ typedef struct {
 	uint16_t index;
 } efibootmgr_opt_t;
 
+typedef struct _var_entry {
+	char		*name;
+	efi_guid_t	guid;
+	uint8_t		*data;
+	size_t		data_size;
+	uint32_t	attributes;
+	uint16_t	num;
+	list_t		list;
+} var_entry_t;
+
 extern efibootmgr_opt_t opts;
 
+int read_u16(const char *name);
+int read_order(const char *name, var_entry_t **order);
+
 #endif