Moved random_uuid helper into util.c

Only used in one place.  Define there.

Author: bgoing-micron-oss

libnvme/src/nvme/util.c

@@ -770,6 +770,47 @@ __public int libnvme_uuid_from_string(const char *str, unsigned char uuid[NVME_U
 
 }
 
+#if defined(_WIN32) || defined(_WIN64)
+
+#include <bcrypt.h>
+
+/* Windows-specific UUID generation using BCryptGenRandom */
+static inline int random_uuid(unsigned char *uuid, size_t len)
+{
+	NTSTATUS status;
+
+	status = BCryptGenRandom(NULL, uuid, (ULONG)len,
+				 BCRYPT_USE_SYSTEM_PREFERRED_RNG);
+	if (!BCRYPT_SUCCESS(status))
+		return -EIO;
+
+	return 0;
+}
+
+#else
+
+/* Linux-specific UUID generation using /dev/urandom */
+static inline int random_uuid(unsigned char *uuid, size_t len)
+{
+	int f, ret = 0;
+	ssize_t n;
+
+	f = open("/dev/urandom", O_RDONLY);
+	if (f < 0)
+		return -errno;
+
+	n = read(f, uuid, len);
+	if (n < 0)
+		ret = -errno;
+	else if ((size_t)n != len)
+		ret = -EIO;
+
+	close(f);
+	return ret;
+}
+
+#endif
+
 __public int libnvme_random_uuid(unsigned char uuid[NVME_UUID_LEN])
 {
 	int ret;

libnvme/src/platform/linux.h

@@ -42,23 +42,3 @@ typedef int libnvme_fd_t;
 
 /* Platform initialization - no-op on Linux */
 static inline void libnvme_init(void) {}
-
-/* Platform-specific UUID generation using /dev/urandom */
-static inline int random_uuid(unsigned char *uuid, size_t len)
-{
-	int f, ret = 0;
-	ssize_t n;
-
-	f = open("/dev/urandom", O_RDONLY);
-	if (f < 0)
-		return -errno;
-
-	n = read(f, uuid, len);
-	if (n < 0)
-		ret = -errno;
-	else if ((size_t)n != len)
-		ret = -EIO;
-
-	close(f);
-	return ret;
-}

libnvme/src/platform/windows.h

@@ -44,19 +44,6 @@ static inline void libnvme_init(void)
 	_setmode(_fileno(stderr), O_BINARY);
 }
 
-/* Platform-specific UUID generation using BCryptGenRandom */
-static inline int random_uuid(unsigned char *uuid, size_t len)
-{
-	NTSTATUS status;
-
-	status = BCryptGenRandom(NULL, uuid, (ULONG)len,
-				 BCRYPT_USE_SYSTEM_PREFERRED_RNG);
-	if (!BCRYPT_SUCCESS(status))
-		return -EIO;
-
-	return 0;
-}
-
 
 /* time.h POSIX compatibility */