Cleanup of platform/includes.h usage.

- Removed platform/includes usage where possible.
- Restored default includes where possible.
- Removed unneeded support from platform/windows.h

Author: bgoing-micron-oss

libnvme/src/nvme/cleanup.h

@@ -4,9 +4,7 @@
 
 #include <stdlib.h>
 
-#include <platform/includes.h>
-
-#include "private.h"
+#include "private.h"	/* for __libnvme_free */
 
 #define __cleanup(fn) __attribute__((cleanup(fn)))
 

libnvme/src/nvme/ioctl.c

@@ -29,7 +29,7 @@
 static int nvme_verify_chr(struct libnvme_transport_handle *hdl)
 {
 	static struct stat nvme_stat;
-	int err = libnvme_fstat(hdl->fd, &nvme_stat);
+	int err = fstat(hdl->fd, &nvme_stat);
 
 	if (err < 0)
 		return -errno;

libnvme/src/nvme/log.c

@@ -12,8 +12,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
-
-#include <platform/includes.h>
+#include <unistd.h>
 
 #include <libnvme.h>
 

libnvme/src/nvme/mi-mctp.c

@@ -12,8 +12,12 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
-#include <platform/includes.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/uio.h>
 
 #if HAVE_LINUX_MCTP_H
 #include <linux/mctp.h>

libnvme/src/nvme/util.c

@@ -19,13 +19,14 @@
 #if defined(HAVE_NETDB) || defined(CONFIG_FABRICS)
 #include <sys/types.h>
 #include <ifaddrs.h>
+#include <arpa/inet.h>
+#include <netdb.h>
 #endif
 
+#include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <platform/includes.h>
-
 #include <ccan/endian/endian.h>
 #include <ccan/minmax/minmax.h>
 

libnvme/src/platform/windows.h

@@ -44,20 +44,27 @@ 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;
 
-/* sys/param.h compatibility */
+	status = BCryptGenRandom(NULL, uuid, (ULONG)len,
+				 BCRYPT_USE_SYSTEM_PREFERRED_RNG);
+	if (!BCRYPT_SUCCESS(status))
+		return -EIO;
 
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
+	return 0;
+}
 
 
 /* errno.h compatibility */
 
-#define EREMOTEIO 121
-#define EDQUOT    122
-#define ERESTART  85
-#define ENOTBLK   15
-#define ENAVAIL   119
+#define EREMOTEIO 121	// util.c
+#define EDQUOT    122	// util.c
+#define ERESTART  85	// util.c
+#define ENOTBLK   15	// sfx-nvme.c - could they just use libnvme's check for char device instead?
+#define ENAVAIL   119	// nvme.c - just used internally, define a custom, internal error code for this?
 
 
 /* ifaddrs.h compatibility */
@@ -72,21 +79,6 @@ struct ifaddrs {
 	void *ifa_data;
 };
 
-static inline void freeifaddrs(struct ifaddrs *ifa) { (void)ifa; }
-
-/* 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;
-}
-
 
 /* stdio.h POSIX extensions */
 
@@ -175,29 +167,6 @@ static inline FILE *open_memstream(char **ptr, size_t *sizeloc)
 }
 
 
-/* string.h POSIX extensions */
-
-/* strsep implementation for Windows */
-static inline char *strsep(char **stringp, const char *delim)
-{
-	char *start = *stringp;
-	char *p;
-
-	if (start == NULL)
-		return NULL;
-
-	p = strpbrk(start, delim);
-	if (p) {
-		*p = '\0';
-		*stringp = p + 1;
-	} else {
-		*stringp = NULL;
-	}
-
-	return start;
-}
-
-
 /* stdlib.h compatibility */
 
 /* Aligned memory allocation function, use platform_aligned_free to free. */
@@ -316,67 +285,17 @@ static inline int sigaction(int signum, const struct sigaction *act,
 }
 
 
-/* fnmatch.h POSIX compatibility - Only used by fabrics - consider removing */
-
-#define FNM_NOMATCH 1
-#define FNM_PATHNAME 0x01
-
-/* Basic fnmatch implementation for Windows:
- * - Supports '*' (match any sequence, including empty) and
- *   '?' (match any single character).
- * - Ignores flags for now; they are accepted for compatibility.
- * Returns 0 on match, FNM_NOMATCH on mismatch.
- */
-static inline int fnmatch(const char *pattern, const char *string, int flags)
-{
-	(void)flags; /* flags currently unused */
-
-	while (*pattern) {
-		if (*pattern == '*') {
-			/* Skip consecutive '*' characters */
-			while (*pattern == '*')
-				pattern++;
-
-			if (!*pattern)
-				/* Trailing '*' matches the rest of the string */
-				return 0;
-
-			/* Try to match the remainder of the pattern at each suffix of string */
-			while (*string) {
-				if (!fnmatch(pattern, string, flags))
-					return 0;
-				string++;
-			}
-			/* No match found for pattern suffix after '*' */
-			return FNM_NOMATCH;
-		} else if (*pattern == '?') {
-			/* '?' matches any single character, if present */
-			if (!*string)
-				return FNM_NOMATCH;
-			pattern++;
-			string++;
-		} else {
-			/* Literal character match */
-			if (*pattern != *string)
-				return FNM_NOMATCH;
-			pattern++;
-			string++;
-		}
-	}
-
-	/* At end of pattern: match only if we're also at end of string */
-	return *string ? FNM_NOMATCH : 0;
-}
-
-
 /* limits.h compatibility */
 
 #ifndef NAME_MAX
 #define NAME_MAX 260
 #endif
 
 
+/* sys/stat.h compatibility */
+
 /* Windows _mkdir doesn't take mode parameter */
+/* _mkdir is defined in <direct.h> */
 #define mkdir(path, mode) _mkdir(path)
 
 /* Platform-specific fstat wrapper for libnvme_fd_t */

logging.c

@@ -6,7 +6,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <platform/includes.h>
+#include <sys/time.h>
 
 #include <ccan/endian/endian.h>
 

nvme-print-json.c

@@ -4,11 +4,16 @@
 #include <errno.h>
 #include <time.h>
 #include <sys/types.h>
-#include <platform/includes.h>
+
+#ifdef CONFIG_FABRICS
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#endif
 
 #include <ccan/compiler/compiler.h>
 
 #include <libnvme.h>
+
 #include "nvme-print.h"
 
 #include "util/json.h"

nvme-print-stdout.c

@@ -5,7 +5,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <platform/includes.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#ifdef CONFIG_FABRICS
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#endif
+
 #include <ccan/strset/strset.h>
 #include <ccan/htable/htable_type.h>
 #include <ccan/htable/htable.h>

util/table.c

@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include <platform/includes.h>
+#include <platform/includes.h>	/* for reallocarray */
 
 #include "table.h"