cleanup: rename _cleanup_file_ to __cleanup_file

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 <[email protected]>

Author: igaw

libnvme/src/nvme/cleanup.h

@@ -32,7 +32,7 @@ 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)
+#define __cleanup_file __cleanup(cleanup_file)
 
 static inline DEFINE_CLEANUP_FUNC(cleanup_dir, DIR *, closedir)
 #define _cleanup_dir_ __cleanup(cleanup_dir)

libnvme/src/nvme/linux.c

@@ -1816,7 +1816,7 @@ static int uuid_from_dmi_entries(char *system_uuid)
  */
 static int uuid_from_product_uuid(char *system_uuid)
 {
-	_cleanup_file_ FILE *stream = NULL;
+	__cleanup_file FILE *stream = NULL;
 	ssize_t nread;
 	__cleanup_free char *line = NULL;
 	size_t len = 0;

libnvme/src/nvme/util.c

@@ -581,7 +581,7 @@ char *kv_keymatch(const char *kv, const char *key)
 static size_t read_file(const char * fname, char *buffer, size_t *bufsz)
 {
 	char   *p;
-	_cleanup_file_ FILE *file = NULL;
+	__cleanup_file FILE *file = NULL;
 	size_t len;
 
 	file = fopen(fname, "re");
@@ -630,7 +630,7 @@ size_t get_entity_name(char *buffer, size_t bufsz)
 
 size_t get_entity_version(char *buffer, size_t bufsz)
 {
-	_cleanup_file_ FILE *file = NULL;
+	__cleanup_file FILE *file = NULL;
 	size_t  num_bytes = 0;
 
 	/* /proc/sys/kernel/ostype typically contains the string "Linux" */

nvme-rpmb.c

@@ -210,7 +210,7 @@ static void write_file(unsigned char *data, size_t len, const char *dir,
 		       const char *file, const char *msg)
 {
 	char temp_folder[PATH_MAX] = { 0 };
-	_cleanup_file_ FILE *fp = NULL;
+	__cleanup_file FILE *fp = NULL;
 
 	if (dir != NULL)
 		sprintf(temp_folder, "%s/%s", dir, file);

nvme.c

@@ -9743,7 +9743,7 @@ static int append_keyfile(struct libnvme_global_ctx *ctx, const char *keyring,
 	__cleanup_free unsigned char *key_data = NULL;
 	__cleanup_free char *exported_key = NULL;
 	__cleanup_free char *identity = NULL;
-	_cleanup_file_ FILE *fd = NULL;
+	__cleanup_file FILE *fd = NULL;
 	int err, ver, hmac, key_len;
 	mode_t old_umask;
 	long kr_id;
@@ -10166,7 +10166,7 @@ static int tls_key(int argc, char **argv, struct command *acmd, struct plugin *p
 	const char *revoke = "Revoke key from the keyring.";
 
 	_cleanup_nvme_global_ctx_ struct libnvme_global_ctx *ctx = NULL;
-	_cleanup_file_ FILE *fd = NULL;
+	__cleanup_file FILE *fd = NULL;
 	mode_t old_umask = 0;
 	int cnt, err = 0;
 

plugins/innogrit/innogrit-nvme.c

@@ -176,7 +176,7 @@ static int innogrit_geteventlog(int argc, char **argv,
 	const char *desc = "Recrieve event log for the given device ";
 	_cleanup_nvme_transport_handle_ struct libnvme_transport_handle *hdl = NULL;
 	_cleanup_nvme_global_ctx_ struct libnvme_global_ctx *ctx = NULL;
-	_cleanup_file_ FILE *fp = NULL;
+	__cleanup_file FILE *fp = NULL;
 	char currentdir[128], filename[512];
 	struct tm *logtime;
 	time_t timep;

plugins/lm/lm-nvme.c

@@ -277,7 +277,7 @@ static int lm_migration_send(int argc, char **argv, struct command *acmd, struct
 	_cleanup_nvme_transport_handle_ struct libnvme_transport_handle *hdl = NULL;
 	_cleanup_nvme_global_ctx_ struct libnvme_global_ctx *ctx = NULL;
 	_cleanup_huge_ struct nvme_mem_huge mh = { 0, };
-	_cleanup_file_ FILE *file = NULL;
+	__cleanup_file FILE *file = NULL;
 	struct libnvme_passthru_cmd cmd;
 	void *data = NULL;
 	int err = -1;
@@ -409,7 +409,7 @@ static int lm_migration_recv(int argc, char **argv, struct command *acmd, struct
 	_cleanup_nvme_transport_handle_ struct libnvme_transport_handle *hdl = NULL;
 	_cleanup_nvme_global_ctx_ struct libnvme_global_ctx *ctx = NULL;
 	_cleanup_huge_ struct nvme_mem_huge mh = { 0, };
-	_cleanup_file_ FILE *fd = NULL;
+	__cleanup_file FILE *fd = NULL;
 	struct libnvme_passthru_cmd cmd;
 	nvme_print_flags_t flags;
 	void *data = NULL;

util/cleanup.h

@@ -61,6 +61,6 @@ static inline void cleanup_nvmf_context(struct libnvmf_context **fctx)
 #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 */