cleanup: move POSIX API cleanup helpers into a separate file

The main cleanup header file should only import generic headers to
simplify ports.

Signed-off-by: Daniel Wagner <[email protected]>

Author: igaw

libnvme/src/nvme/cleanup-linux.h

@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: LGPL-2.1-or-later
+/*
+ * This file is part of libnvme.
+ * Copyright (c) 2026 SUSE Software Solutions
+ *
+ * Authors: Daniel Wagner <[email protected]>
+ */
+
+#pragma once
+
+#include <dirent.h>
+#include <unistd.h>
+
+#include "cleanup.h"
+
+static inline DEFINE_CLEANUP_FUNC(cleanup_file, FILE *, fclose)
+#define __cleanup_file __cleanup(cleanup_file)
+
+static inline DEFINE_CLEANUP_FUNC(cleanup_dir, DIR *, closedir)
+#define __cleanup_dir __cleanup(cleanup_dir)
+
+static inline void cleanup_fd(int *fd)
+{
+	if (*fd >= 0)
+		close(*fd);
+}
+#define __cleanup_fd __cleanup(cleanup_fd)

libnvme/src/nvme/cleanup.h

@@ -2,12 +2,7 @@
 #ifndef __CLEANUP_H
 #define __CLEANUP_H
 
-#include <dirent.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
-
-#include "fabrics.h"
 
 #define __cleanup(fn) __attribute__((cleanup(fn)))
 
@@ -27,17 +22,4 @@ static inline void freep(void *p)
 }
 #define __cleanup_free __cleanup(freep)
 
-static inline DEFINE_CLEANUP_FUNC(cleanup_file, FILE *, fclose)
-#define __cleanup_file __cleanup(cleanup_file)
-
-static inline DEFINE_CLEANUP_FUNC(cleanup_dir, DIR *, closedir)
-#define __cleanup_dir __cleanup(cleanup_dir)
-
-static inline void cleanup_fd(int *fd)
-{
-	if (*fd >= 0)
-		close(*fd);
-}
-#define __cleanup_fd __cleanup(cleanup_fd)
-
 #endif

libnvme/src/nvme/fabrics.c

@@ -35,6 +35,7 @@
 #include <libnvme.h>
 
 #include "cleanup.h"
+#include "cleanup-linux.h"
 #include "private.h"
 #include "private-fabrics.h"
 #include "compiler-attributes.h"

libnvme/src/nvme/lib.c

@@ -16,6 +16,7 @@
 #include <libnvme.h>
 
 #include "cleanup.h"
+#include "cleanup-linux.h"
 #include "private.h"
 #include "compiler-attributes.h"
 

libnvme/src/nvme/linux.c

@@ -50,6 +50,7 @@
 #include "crc32.h"
 #include "base64.h"
 #include "cleanup.h"
+#include "cleanup-linux.h"
 #include "private.h"
 #include "compiler-attributes.h"
 

libnvme/src/nvme/tree.c

@@ -28,6 +28,7 @@
 #include <libnvme.h>
 
 #include "cleanup.h"
+#include "cleanup-linux.h"
 #include "private.h"
 #include "util.h"
 #include "compiler-attributes.h"

libnvme/src/nvme/util.c

@@ -28,6 +28,7 @@
 #include <libnvme.h>
 
 #include "cleanup.h"
+#include "cleanup-linux.h"
 #include "private.h"
 #include "util.h"
 #include "compiler-attributes.h"