cleanup: rename _cleanup_addrinfo_ to __cleanup_addrinfo

igaw · igaw · commit 24cda3daa709 · 2026-04-14T09:59:14.000+02:00
Follow the new naming pattern of the compiler attributes which is just
__NAME. This is what the kernel is using as well.

Signed-off-by: Daniel Wagner &lt;wagi@kernel.org&gt;
diff --git a/libnvme/src/nvme/cleanup.h b/libnvme/src/nvme/cleanup.h
@@ -45,7 +45,7 @@ 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)
+#define __cleanup_addrinfo __cleanup(cleanup_addrinfo)
 
 static inline void free_uri(struct libnvme_fabrics_uri **uri)
 {
diff --git a/libnvme/src/nvme/util.c b/libnvme/src/nvme/util.c
@@ -456,7 +456,7 @@ __public const char *libnvme_strerror(int errnum)
 int hostname2traddr(struct libnvme_global_ctx *ctx, const char *traddr,
 		    char **hostname)
 {
-	_cleanup_addrinfo_ struct addrinfo *host_info = NULL;
+	__cleanup_addrinfo struct addrinfo *host_info = NULL;
 	struct addrinfo hints = {.ai_family = AF_UNSPEC};
 	char addrstr[NVMF_TRADDR_SIZE];
 	const char *p;

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ static inline void cleanup_fd(int *fd)`
`45`	`45`	`#define __cleanup_fd __cleanup(cleanup_fd)`
`46`	`46`
`47`	`47`	`static inline DEFINE_CLEANUP_FUNC(cleanup_addrinfo, struct addrinfo *, freeaddrinfo)`
`48`		`-#define _cleanup_addrinfo_ __cleanup(cleanup_addrinfo)`
	`48`	`+#define __cleanup_addrinfo __cleanup(cleanup_addrinfo)`
`49`	`49`
`50`	`50`	`static inline void free_uri(struct libnvme_fabrics_uri **uri)`
`51`	`51`	`{`
Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,7 @@ __public const char *libnvme_strerror(int errnum)`
`456`	`456`	`int hostname2traddr(struct libnvme_global_ctx ctx, const char traddr,`
`457`	`457`	`char **hostname)`
`458`	`458`	`{`
`459`		`- _cleanup_addrinfo_ struct addrinfo *host_info = NULL;`
	`459`	`+ __cleanup_addrinfo struct addrinfo *host_info = NULL;`
`460`	`460`	`struct addrinfo hints = {.ai_family = AF_UNSPEC};`
`461`	`461`	`char addrstr[NVMF_TRADDR_SIZE];`
`462`	`462`	`const char *p;`