cleanup: rename __cleanup__ to __cleanup

igaw · igaw · commit 7adfa53019ec · 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
@@ -13,7 +13,7 @@
 
 #include "fabrics.h"
 
-#define __cleanup__(fn) __attribute__((cleanup(fn)))
+#define __cleanup(fn) __attribute__((cleanup(fn)))
 
 #define DECLARE_CLEANUP_FUNC(name, type) \
 	void name(type *__p)
@@ -29,29 +29,29 @@ static inline void freep(void *p)
 {
 	free(*(void **)p);
 }
-#define _cleanup_free_ __cleanup__(freep)
+#define _cleanup_free_ __cleanup(freep)
 
 static inline DEFINE_CLEANUP_FUNC(cleanup_file, FILE *, fclose)
-#define _cleanup_file_ __cleanup__(cleanup_file)
+#define _cleanup_file_ __cleanup(cleanup_file)
 
 static inline DEFINE_CLEANUP_FUNC(cleanup_dir, DIR *, closedir)
-#define _cleanup_dir_ __cleanup__(cleanup_dir)
+#define _cleanup_dir_ __cleanup(cleanup_dir)
 
 static inline void cleanup_fd(int *fd)
 {
 	if (*fd >= 0)
 		close(*fd);
 }
-#define _cleanup_fd_ __cleanup__(cleanup_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)
 {
 	if (*uri)
 		libnvmf_free_uri(*uri);
 }
-#define _cleanup_uri_ __cleanup__(free_uri)
+#define _cleanup_uri_ __cleanup(free_uri)
 
 #endif
diff --git a/libnvme/src/nvme/json.c b/libnvme/src/nvme/json.c
@@ -191,7 +191,7 @@ static void json_parse_host(struct libnvme_global_ctx *ctx, struct json_object *
 }
 
 static DEFINE_CLEANUP_FUNC(cleanup_tokener, json_tokener *, json_tokener_free)
-#define _cleanup_tokener_ __cleanup__(cleanup_tokener)
+#define _cleanup_tokener_ __cleanup(cleanup_tokener)
 
 static struct json_object *parse_json(struct libnvme_global_ctx *ctx, int fd)
 {
diff --git a/libnvme/src/nvme/linux.c b/libnvme/src/nvme/linux.c
@@ -263,7 +263,7 @@ static const EVP_MD *select_hmac(int hmac, size_t *hmac_len)
 
 static DEFINE_CLEANUP_FUNC(
 	cleanup_evp_pkey_ctx, EVP_PKEY_CTX *, EVP_PKEY_CTX_free)
-#define _cleanup_evp_pkey_ctx_ __cleanup__(cleanup_evp_pkey_ctx)
+#define _cleanup_evp_pkey_ctx_ __cleanup(cleanup_evp_pkey_ctx)
 
 /* NVMe is using the TLS 1.3 HkdfLabel structure */
 #define HKDF_INFO_MAX_LEN 514
@@ -598,11 +598,11 @@ static int derive_tls_key_compat(struct libnvme_global_ctx *ctx,
 
 static DEFINE_CLEANUP_FUNC(
 	cleanup_ossl_lib_ctx, OSSL_LIB_CTX *, OSSL_LIB_CTX_free)
-#define _cleanup_ossl_lib_ctx_ __cleanup__(cleanup_ossl_lib_ctx)
+#define _cleanup_ossl_lib_ctx_ __cleanup(cleanup_ossl_lib_ctx)
 static DEFINE_CLEANUP_FUNC(cleanup_evp_mac_ctx, EVP_MAC_CTX *, EVP_MAC_CTX_free)
-#define _cleanup_evp_mac_ctx_ __cleanup__(cleanup_evp_mac_ctx)
+#define _cleanup_evp_mac_ctx_ __cleanup(cleanup_evp_mac_ctx)
 static DEFINE_CLEANUP_FUNC(cleanup_evp_mac, EVP_MAC *, EVP_MAC_free)
-#define _cleanup_evp_mac_ __cleanup__(cleanup_evp_mac)
+#define _cleanup_evp_mac_ __cleanup(cleanup_evp_mac)
 
 __public int libnvme_gen_dhchap_key(struct libnvme_global_ctx *ctx,
 		char *hostnqn, enum libnvme_hmac_alg hmac,
diff --git a/libnvme/src/nvme/tree.c b/libnvme/src/nvme/tree.c
@@ -109,7 +109,7 @@ static void cleanup_dirents(struct dirents *ents)
 	free(ents->ents);
 }
 
-#define _cleanup_dirents_ __cleanup__(cleanup_dirents)
+#define _cleanup_dirents_ __cleanup(cleanup_dirents)
 
 static char *nvme_hostid_from_hostnqn(const char *hostnqn)
 {
diff --git a/libnvme/test/ioctl/util.h b/libnvme/test/ioctl/util.h
@@ -17,12 +17,12 @@ void arbitrary(void *buf, size_t len);
 
 size_t arbitrary_range(size_t max);
 
-#define __cleanup__(fn) __attribute__((cleanup(fn)))
+#define __cleanup(fn) __attribute__((cleanup(fn)))
 
 static inline void freep(void *p)
 {
 	free(*(void **)p);
 }
-#define _cleanup_free_ __cleanup__(freep)
+#define _cleanup_free_ __cleanup(freep)
 
 #endif /* #ifndef _LIBNVME_TEST_IOCTL_UTIL_H */
diff --git a/nvme.h b/nvme.h
@@ -117,7 +117,7 @@ int parse_and_open(struct libnvme_global_ctx **ctx,
 // TODO: unsure if we need a double ptr here
 static inline DEFINE_CLEANUP_FUNC(
 	cleanup_nvme_transport_handle, struct libnvme_transport_handle *, libnvme_close)
-#define _cleanup_nvme_transport_handle_ __cleanup__(cleanup_nvme_transport_handle)
+#define _cleanup_nvme_transport_handle_ __cleanup(cleanup_nvme_transport_handle)
 
 extern const char *uuid_index;
 extern const char *namespace_id_desired;
diff --git a/util/cleanup.h b/util/cleanup.h
@@ -9,7 +9,7 @@
 
 #include "util/mem.h"
 
-#define __cleanup__(fn) __attribute__((cleanup(fn)))
+#define __cleanup(fn) __attribute__((cleanup(fn)))
 
 #define DECLARE_CLEANUP_FUNC(name, type) \
 	void name(type *__p)
@@ -25,42 +25,42 @@ static inline void freep(void *p)
 {
 	free(*(void **)p);
 }
-#define _cleanup_free_ __cleanup__(freep)
+#define _cleanup_free_ __cleanup(freep)
 
-#define _cleanup_huge_ __cleanup__(nvme_free_huge)
+#define _cleanup_huge_ __cleanup(nvme_free_huge)
 
 static inline void cleanup_fd(int *fd)
 {
 	if (*fd > STDERR_FILENO)
 		close(*fd);
 }
-#define _cleanup_fd_ __cleanup__(cleanup_fd)
+#define _cleanup_fd_ __cleanup(cleanup_fd)
 
 static inline void cleanup_nvme_global_ctx(struct libnvme_global_ctx **ctx)
 {
 	libnvme_free_global_ctx(*ctx);
 }
-#define _cleanup_nvme_global_ctx_ __cleanup__(cleanup_nvme_global_ctx)
+#define _cleanup_nvme_global_ctx_ __cleanup(cleanup_nvme_global_ctx)
 
 static inline DEFINE_CLEANUP_FUNC(cleanup_nvme_ctrl, libnvme_ctrl_t, libnvme_free_ctrl)
-#define _cleanup_nvme_ctrl_ __cleanup__(cleanup_nvme_ctrl)
+#define _cleanup_nvme_ctrl_ __cleanup(cleanup_nvme_ctrl)
 
 #ifdef CONFIG_FABRICS
 static inline void free_uri(struct libnvme_fabrics_uri **uri)
 {
 	if (*uri)
 		libnvmf_free_uri(*uri);
 }
-#define _cleanup_uri_ __cleanup__(free_uri)
+#define _cleanup_uri_ __cleanup(free_uri)
 
 static inline void cleanup_nvmf_context(struct libnvmf_context **fctx)
 {
 	libnvmf_context_free(*fctx);
 }
-#define _cleanup_nvmf_context_ __cleanup__(cleanup_nvmf_context)
+#define _cleanup_nvmf_context_ __cleanup(cleanup_nvmf_context)
 #endif
 
 static inline DEFINE_CLEANUP_FUNC(cleanup_file, FILE *, fclose)
-#define _cleanup_file_ __cleanup__(cleanup_file)
+#define _cleanup_file_ __cleanup(cleanup_file)
 
 #endif /* __CLEANUP_H */

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ static void json_parse_host(struct libnvme_global_ctx ctx, struct json_object `
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`static DEFINE_CLEANUP_FUNC(cleanup_tokener, json_tokener *, json_tokener_free)`
`194`		`-#define _cleanup_tokener_ __cleanup__(cleanup_tokener)`
	`194`	`+#define _cleanup_tokener_ __cleanup(cleanup_tokener)`
`195`	`195`
`196`	`196`	`static struct json_object parse_json(struct libnvme_global_ctx ctx, int fd)`
`197`	`197`	`{`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ static void cleanup_dirents(struct dirents *ents)`
`109`	`109`	`free(ents->ents);`
`110`	`110`	`}`
`111`	`111`
`112`		`-#define _cleanup_dirents_ __cleanup__(cleanup_dirents)`
	`112`	`+#define _cleanup_dirents_ __cleanup(cleanup_dirents)`
`113`	`113`
`114`	`114`	`static char nvme_hostid_from_hostnqn(const char hostnqn)`
`115`	`115`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,12 @@ void arbitrary(void *buf, size_t len);`
`17`	`17`
`18`	`18`	`size_t arbitrary_range(size_t max);`
`19`	`19`
`20`		`-#define __cleanup__(fn) __attribute__((cleanup(fn)))`
	`20`	`+#define __cleanup(fn) __attribute__((cleanup(fn)))`
`21`	`21`
`22`	`22`	`static inline void freep(void *p)`
`23`	`23`	`{`
`24`	`24`	`free((void *)p);`
`25`	`25`	`}`
`26`		`-#define _cleanup_free_ __cleanup__(freep)`
	`26`	`+#define _cleanup_free_ __cleanup(freep)`
`27`	`27`
`28`	`28`	`#endif /* #ifndef _LIBNVME_TEST_IOCTL_UTIL_H */`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`#include "util/mem.h"`
`11`	`11`
`12`		`-#define __cleanup__(fn) __attribute__((cleanup(fn)))`
	`12`	`+#define __cleanup(fn) __attribute__((cleanup(fn)))`
`13`	`13`
`14`	`14`	`#define DECLARE_CLEANUP_FUNC(name, type) \`
`15`	`15`	`void name(type *__p)`
`@@ -25,42 +25,42 @@ static inline void freep(void *p)`
`25`	`25`	`{`
`26`	`26`	`free((void *)p);`
`27`	`27`	`}`
`28`		`-#define _cleanup_free_ __cleanup__(freep)`
	`28`	`+#define _cleanup_free_ __cleanup(freep)`
`29`	`29`
`30`		`-#define _cleanup_huge_ __cleanup__(nvme_free_huge)`
	`30`	`+#define _cleanup_huge_ __cleanup(nvme_free_huge)`
`31`	`31`
`32`	`32`	`static inline void cleanup_fd(int *fd)`
`33`	`33`	`{`
`34`	`34`	`if (*fd > STDERR_FILENO)`
`35`	`35`	`close(*fd);`
`36`	`36`	`}`
`37`		`-#define _cleanup_fd_ __cleanup__(cleanup_fd)`
	`37`	`+#define _cleanup_fd_ __cleanup(cleanup_fd)`
`38`	`38`
`39`	`39`	`static inline void cleanup_nvme_global_ctx(struct libnvme_global_ctx **ctx)`
`40`	`40`	`{`
`41`	`41`	`libnvme_free_global_ctx(*ctx);`
`42`	`42`	`}`
`43`		`-#define _cleanup_nvme_global_ctx_ __cleanup__(cleanup_nvme_global_ctx)`
	`43`	`+#define _cleanup_nvme_global_ctx_ __cleanup(cleanup_nvme_global_ctx)`
`44`	`44`
`45`	`45`	`static inline DEFINE_CLEANUP_FUNC(cleanup_nvme_ctrl, libnvme_ctrl_t, libnvme_free_ctrl)`
`46`		`-#define _cleanup_nvme_ctrl_ __cleanup__(cleanup_nvme_ctrl)`
	`46`	`+#define _cleanup_nvme_ctrl_ __cleanup(cleanup_nvme_ctrl)`
`47`	`47`
`48`	`48`	`#ifdef CONFIG_FABRICS`
`49`	`49`	`static inline void free_uri(struct libnvme_fabrics_uri **uri)`
`50`	`50`	`{`
`51`	`51`	`if (*uri)`
`52`	`52`	`libnvmf_free_uri(*uri);`
`53`	`53`	`}`
`54`		`-#define _cleanup_uri_ __cleanup__(free_uri)`
	`54`	`+#define _cleanup_uri_ __cleanup(free_uri)`
`55`	`55`
`56`	`56`	`static inline void cleanup_nvmf_context(struct libnvmf_context **fctx)`
`57`	`57`	`{`
`58`	`58`	`libnvmf_context_free(*fctx);`
`59`	`59`	`}`
`60`		`-#define _cleanup_nvmf_context_ __cleanup__(cleanup_nvmf_context)`
	`60`	`+#define _cleanup_nvmf_context_ __cleanup(cleanup_nvmf_context)`
`61`	`61`	`#endif`
`62`	`62`
`63`	`63`	`static inline DEFINE_CLEANUP_FUNC(cleanup_file, FILE *, fclose)`
`64`		`-#define _cleanup_file_ __cleanup__(cleanup_file)`
	`64`	`+#define _cleanup_file_ __cleanup(cleanup_file)`
`65`	`65`
`66`	`66`	`#endif /* __CLEANUP_H */`