From 342e5abe5e46cf6e45fb4fb75a057b660abb978d Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 27 Nov 2022 09:34:20 +0000 Subject: util/nvmutil: improved errno handling in main --- util/nvmutil/nvmutil.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/util/nvmutil/nvmutil.c b/util/nvmutil/nvmutil.c index a5173a81..a9ed5c80 100644 --- a/util/nvmutil/nvmutil.c +++ b/util/nvmutil/nvmutil.c @@ -113,15 +113,15 @@ main(int argc, char *argv[]) else if (readFromFile(&fd, gbe, FILENAME, flags, SIZE_8KB) != SIZE_8KB) goto nvmutil_exit; - if (errno != 0) - goto nvmutil_exit; - else if (strMac != NULL) - setmac(strMac); - else if (cmd != NULL) - (*cmd)(); - - if (gbeFileModified) - writeGbeFile(&fd, FILENAME); + if (errno == 0) { + if (strMac != NULL) + setmac(strMac); + else if (cmd != NULL) + (*cmd)(); + + if (gbeFileModified) + writeGbeFile(&fd, FILENAME); + } nvmutil_exit: if (!((errno == ECANCELED) && (flags == O_RDONLY))) -- cgit v1.2.1