From 6ebd178f281cea6474e66c88230f833ab0e97827 Mon Sep 17 00:00:00 2001
From: lbmkplaceholder <placeholder@lbmkplaceholder.com>
Date: Wed, 21 Dec 2022 15:45:17 +0000
Subject: util/nvmutil: simplified error handling in rhex()

---
 util/nvmutil/nvmutil.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'util')

diff --git a/util/nvmutil/nvmutil.c b/util/nvmutil/nvmutil.c
index bbfa7b3d..80d515f7 100644
--- a/util/nvmutil/nvmutil.c
+++ b/util/nvmutil/nvmutil.c
@@ -178,11 +178,9 @@ cmd_setmac(const char *strMac)
 				goto invalid_mac_address;
 		byte = o / 3;
 		for (nib = 0; nib < 2; nib++, total += val8) {
-			if ((val8 = hextonum(strMac[o + nib])) > 15) {
-				if (errno != 0)
-					return;
+			if ((val8 = hextonum(strMac[o + nib])) > 15)
 				goto invalid_mac_address;
-			} else if ((byte == 0) && (nib == 1)) {
+			if ((byte == 0) && (nib == 1)) {
 				if (strMac[o + nib] == '?')
 					val8 = (val8 & 0xE) | 2;
 			}
@@ -258,12 +256,10 @@ rhex(void)
 			rfd = -1;
 		}
 		if (readFromFile(&rfd, rbuf, "/dev/urandom", O_RDONLY, BUFSIZ)
-		    != BUFSIZ) {
-			warn("%s", "/dev/urandom");
-			return 16;
-		}
+		    != BUFSIZ)
+			err(errno, "/dev/urandom");
 		if (errno != 0)
-			return 16;
+			err(errno, "/dev/urandom");
 	}
 
 	return rbuf[rindex++] & 0xf;
-- 
cgit v1.2.1