cleanup: move optional cleanups to C files

The cleanup helpers for addrinfo and uri depend on features that are
not always available, such as network support or fabrics. Therefore,
they cannot be part of the generic cleanup header file. Also, they are
only used in a single location each. Move them to the C files that use
them.

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

Author: igaw

libnvme/src/nvme/cleanup.h

@@ -3,14 +3,10 @@
 #define __CLEANUP_H
 
 #include <dirent.h>
-#include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <sys/socket.h>
-#include <sys/types.h>
-
 #include "fabrics.h"
 
 #define __cleanup(fn) __attribute__((cleanup(fn)))
@@ -44,14 +40,4 @@ static inline void cleanup_fd(int *fd)
 }
 #define __cleanup_fd __cleanup(cleanup_fd)
 
-static inline DEFINE_CLEANUP_FUNC(cleanup_addrinfo, struct addrinfo *, freeaddrinfo)
-#define __cleanup_addrinfo __cleanup(cleanup_addrinfo)
-
-static inline void free_uri(struct libnvme_fabrics_uri **uri)
-{
-	if (*uri)
-		libnvmf_free_uri(*uri);
-}
-#define __cleanup_uri __cleanup(free_uri)
-
 #endif

libnvme/src/nvme/fabrics.c

@@ -41,6 +41,13 @@
 
 const char *nvmf_dev = "/dev/nvme-fabrics";
 
+static inline void free_uri(struct libnvme_fabrics_uri **uri)
+{
+	if (*uri)
+		libnvmf_free_uri(*uri);
+}
+#define __cleanup_uri __cleanup(free_uri)
+
 /**
  * strchomp() - Strip trailing spaces
  * @str: String to strip

libnvme/src/nvme/linux.c

@@ -16,6 +16,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <netdb.h>
 
 #include <sys/ioctl.h>
 #include <sys/param.h>

libnvme/src/nvme/util.c

@@ -453,6 +453,10 @@ __public const char *libnvme_strerror(int errnum)
 }
 
 #ifdef HAVE_NETDB
+static inline DEFINE_CLEANUP_FUNC(cleanup_addrinfo, struct addrinfo *,
+		freeaddrinfo)
+#define __cleanup_addrinfo __cleanup(cleanup_addrinfo)
+
 int hostname2traddr(struct libnvme_global_ctx *ctx, const char *traddr,
 		    char **hostname)
 {