From: Daniel Wagner <dwagner@suse.de>
Date: Tue, 21 Sep 2021 07:03:06 +0000 (+0200)
Subject: fabrics: Refactor uuid_from_device_tree
X-Git-Tag: v1.0-rc0~104^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e658f1d2bf7dfe99dcf6f2fa3c7274b4f8ed960e;p=users%2Fsagi%2Flibnvme.git

fabrics: Refactor uuid_from_device_tree

The recently added uuid_from_device_tree function can be refactored by
minimizing use of local variables and early returns in error
handling. No functional change.

Signed-off-by: Daniel Wagner <dwagner@suse.de>
---

diff --git a/src/nvme/fabrics.c b/src/nvme/fabrics.c
index cf0b168b..4b0ba16e 100644
--- a/src/nvme/fabrics.c
+++ b/src/nvme/fabrics.c
@@ -594,21 +594,18 @@ out_free_log:
 
 int uuid_from_device_tree(char *system_uuid)
 {
-	char filename[PATH_MAX];
-	int f, len, ret;
+	ssize_t len;
+	int f;
 
-	sprintf(filename, "%s", PATH_UUID_IBM);
-	f = open(filename, O_RDONLY);
+	f = open(PATH_UUID_IBM, O_RDONLY);
 	if (f < 0)
-		goto out_close;
+		return -ENXIO;
 	len = read(f, system_uuid, 512);
+	close(f);
 	if (len < 0)
-		goto out_close;
+		return -ENXIO;
 
-out_close:
-	close(f);
-	ret = -ENXIO;
-	return strlen(system_uuid) ? 0 : ret;
+	return strlen(system_uuid) ? 0 : -ENXIO;
 }
 
 #define PATH_DMI_ENTRIES       "/sys/firmware/dmi/entries"