cleanup: rename _cleanup_uri_ to __cleanup_uri

igaw · igaw · commit f326b214d785 · 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
@@ -52,6 +52,6 @@ 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/fabrics.c b/libnvme/src/nvme/fabrics.c
@@ -2895,7 +2895,7 @@ __public int libnvmf_discovery_nbft(struct libnvme_global_ctx *ctx,
 
 		/* Discovery Descriptor List */
 		for (dd = entry->nbft->discovery_list; dd && *dd; dd++) {
-			_cleanup_uri_ struct libnvme_fabrics_uri *uri = NULL;
+			__cleanup_uri struct libnvme_fabrics_uri *uri = NULL;
 			__cleanup_free char *trsvcid = NULL;
 			struct libnvmf_context nfctx = *fctx;
 			bool persistent = false;
diff --git a/util/cleanup.h b/util/cleanup.h
@@ -51,7 +51,7 @@ 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)
 {

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,6 @@ static inline void free_uri(struct libnvme_fabrics_uri **uri)`
`52`	`52`	`if (*uri)`
`53`	`53`	`libnvmf_free_uri(*uri);`
`54`	`54`	`}`
`55`		`-#define _cleanup_uri_ __cleanup(free_uri)`
	`55`	`+#define __cleanup_uri __cleanup(free_uri)`
`56`	`56`
`57`	`57`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ static inline void free_uri(struct libnvme_fabrics_uri **uri)`
`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`	`{`