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 cf0b168ba557d6036f2949b63403b4c641800e22..4b0ba16e66a87e1ad50b94b1139fd031bab32385 100644 (file)
--- 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"