svn commit: r367055 - stable/12/usr.sbin/efibootmgr

[Ryan Moeller]

Author: freqlabs
Date: Mon Oct 26 12:34:50 2020
New Revision: 367055
URL: https://svnweb.freebsd.org/changeset/base/367055

Log:
  MFC r366830:
  
  efibootmgr: Use returned error code for error message, not errno
  
  efivar_unix_path_to_device_path returns the error code, it does not set errno.
  
  Reviewed by:	imp
  Differential Revision:	https://reviews.freebsd.org/D26852

Modified:
  stable/12/usr.sbin/efibootmgr/efibootmgr.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.sbin/efibootmgr/efibootmgr.c
==============================================================================
--- stable/12/usr.sbin/efibootmgr/efibootmgr.c	Mon Oct 26 08:17:41 2020	(r367054)
+++ stable/12/usr.sbin/efibootmgr/efibootmgr.c	Mon Oct 26 12:34:50 2020	(r367055)
@@ -641,11 +641,16 @@ make_boot_var(const char *label, const char *loader, c
 		err(1, "bootvar creation");
 	if (loader == NULL)
 		errx(1, "Must specify boot loader");
-	if (efivar_unix_path_to_device_path(loader, &loaderdp) != 0)
-		err(1, "Cannot translate unix loader path '%s' to UEFI", loader);
+	ret = efivar_unix_path_to_device_path(loader, &loaderdp);
+	if (ret != 0)
+		errc(1, ret, "Cannot translate unix loader path '%s' to UEFI",
+		    loader);
 	if (kernel != NULL) {
-		if (efivar_unix_path_to_device_path(kernel, &kerneldp) != 0)
-			err(1, "Cannot translate unix kernel path '%s' to UEFI", kernel);
+		ret = efivar_unix_path_to_device_path(kernel, &kerneldp);
+		if (ret != 0)
+			errc(1, ret,
+			    "Cannot translate unix kernel path '%s' to UEFI",
+			    kernel);
 	} else {
 		kerneldp = NULL;
 	}