svn commit: r323484 - stable/11/sys/boot/efi/boot1

[Ryan Libby]

Author: rlibby
Date: Tue Sep 12 06:19:19 2017
New Revision: 323484
URL: https://svnweb.freebsd.org/changeset/base/323484

Log:
  MFC r303723 (by markj):
  
    Fix a few cosmetic issues in boot1.efi.

Modified:
  stable/11/sys/boot/efi/boot1/boot1.c
  stable/11/sys/boot/efi/boot1/ufs_module.c
  stable/11/sys/boot/efi/boot1/zfs_module.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/boot/efi/boot1/boot1.c
==============================================================================
--- stable/11/sys/boot/efi/boot1/boot1.c	Tue Sep 12 06:06:58 2017	(r323483)
+++ stable/11/sys/boot/efi/boot1/boot1.c	Tue Sep 12 06:19:19 2017	(r323484)
@@ -43,7 +43,7 @@ static const boot_module_t *boot_modules[] =
 #endif
 };
 
-#define NUM_BOOT_MODULES (sizeof(boot_modules) / sizeof(boot_module_t*))
+#define	NUM_BOOT_MODULES	nitems(boot_modules)
 /* The initial number of handles used to query EFI for partitions. */
 #define NUM_HANDLES_INIT	24
 
@@ -330,8 +330,6 @@ load_loader(const boot_module_t **modp, dev_info_t **d
 	const boot_module_t *mod;
 
 	for (i = 0; i < NUM_BOOT_MODULES; i++) {
-		if (boot_modules[i] == NULL)
-			continue;
 		mod = boot_modules[i];
 		for (dev = mod->devices(); dev != NULL; dev = dev->next) {
 			if (dev->preferred != preferred)
@@ -354,7 +352,7 @@ load_loader(const boot_module_t **modp, dev_info_t **d
  * it simply boots, otherwise it returns the status of last EFI call.
  */
 static EFI_STATUS
-try_boot()
+try_boot(void)
 {
 	size_t bufsize, loadersize, cmdsize;
 	void *buf, *loaderbuf;
@@ -497,9 +495,6 @@ probe_handle(EFI_HANDLE h, EFI_DEVICE_PATH *imgpath, B
 
 	/* Run through each module, see if it can load this partition */
 	for (i = 0; i < NUM_BOOT_MODULES; i++) {
-		if (boot_modules[i] == NULL)
-			continue;
-
 		if ((status = bs->AllocatePool(EfiLoaderData,
 		    sizeof(*devinfo), (void **)&devinfo)) !=
 		    EFI_SUCCESS) {
@@ -604,9 +599,6 @@ efi_main(EFI_HANDLE Ximage, EFI_SYSTEM_TABLE *Xsystab)
 	printf("   Loader path: %s\n\n", PATH_LOADER_EFI);
 	printf("   Initializing modules:");
 	for (i = 0; i < NUM_BOOT_MODULES; i++) {
-		if (boot_modules[i] == NULL)
-			continue;
-
 		printf(" %s", boot_modules[i]->name);
 		if (boot_modules[i]->init != NULL)
 			boot_modules[i]->init();
@@ -666,10 +658,8 @@ efi_main(EFI_HANDLE Ximage, EFI_SYSTEM_TABLE *Xsystab)
 
 	/* Status summary. */
 	for (i = 0; i < NUM_BOOT_MODULES; i++) {
-		if (boot_modules[i] != NULL) {
-			printf("    ");
-			boot_modules[i]->status();
-		}
+		printf("    ");
+		boot_modules[i]->status();
 	}
 
 	try_boot();

Modified: stable/11/sys/boot/efi/boot1/ufs_module.c
==============================================================================
--- stable/11/sys/boot/efi/boot1/ufs_module.c	Tue Sep 12 06:06:58 2017	(r323483)
+++ stable/11/sys/boot/efi/boot1/ufs_module.c	Tue Sep 12 06:19:19 2017	(r323484)
@@ -142,7 +142,7 @@ load(const char *filepath, dev_info_t *dev, void **buf
 }
 
 static void
-status()
+status(void)
 {
 	int i;
 	dev_info_t *dev;
@@ -164,7 +164,7 @@ status()
 }
 
 static dev_info_t *
-_devices()
+_devices(void)
 {
 
 	return (devices);

Modified: stable/11/sys/boot/efi/boot1/zfs_module.c
==============================================================================
--- stable/11/sys/boot/efi/boot1/zfs_module.c	Tue Sep 12 06:06:58 2017	(r323483)
+++ stable/11/sys/boot/efi/boot1/zfs_module.c	Tue Sep 12 06:19:19 2017	(r323484)
@@ -192,7 +192,7 @@ load(const char *filepath, dev_info_t *devinfo, void *
 }
 
 static void
-status()
+status(void)
 {
 	spa_t *spa;
 
@@ -210,14 +210,14 @@ status()
 }
 
 static void
-init()
+init(void)
 {
 
 	zfs_init();
 }
 
 static dev_info_t *
-_devices()
+_devices(void)
 {
 
 	return (devices);