nvme: change _cleanup_file_ to _cleanup_fd_

Add _cleanup_file_ to clean up file stream instead.

Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>

diff --git a/nvme.c b/nvme.c
index 528eb448b4c05de5e4ffaf418b8dc093dc656386..08553e5664b004d272cf8697cad3dadf29c6daef 100644 (file)
--- a/nvme.c
+++ b/nvme.c
@@ -880,7 +880,7 @@ static int get_telemetry_log(int argc, char **argv, struct command *cmd,
 
        _cleanup_free_ struct nvme_telemetry_log *log = NULL;
        _cleanup_nvme_dev_ struct nvme_dev *dev = NULL;
-       _cleanup_file_ int output = -1;
+       _cleanup_fd_ int output = -1;
        int err = 0;
        size_t total_size;
        __u8 *data_ptr = NULL;
@@ -1808,7 +1808,7 @@ static int get_boot_part_log(int argc, char **argv, struct command *cmd, struct
        _cleanup_free_ __u8 *bp_log = NULL;
        nvme_print_flags_t flags;
        int err = -1;
-       _cleanup_file_ int output = -1;
+       _cleanup_fd_ int output = -1;
        __u32 bpsz = 0;
 
        struct config {
@@ -2183,7 +2183,7 @@ static int io_mgmt_recv(int argc, char **argv, struct command *cmd, struct plugi
        _cleanup_nvme_dev_ struct nvme_dev *dev = NULL;
        _cleanup_free_ void *buf = NULL;
        int err = -1;
-       _cleanup_file_ int dfd = -1;
+       _cleanup_fd_ int dfd = -1;
 
        struct config {
                __u16 mos;
@@ -4903,7 +4903,7 @@ static int fw_download(int argc, char **argv, struct command *cmd, struct plugin
 
        _cleanup_nvme_dev_ struct nvme_dev *dev = NULL;
        _cleanup_huge_ struct nvme_mem_huge mh = { 0, };
-       _cleanup_file_ int fw_fd = -1;
+       _cleanup_fd_ int fw_fd = -1;
        unsigned int fw_size, pos;
        int err;
        struct stat sb;
@@ -6374,7 +6374,7 @@ static int set_feature(int argc, char **argv, struct command *cmd, struct plugin
 
        _cleanup_nvme_dev_ struct nvme_dev *dev = NULL;
        _cleanup_free_ void *buf = NULL;
-       _cleanup_file_ int ffd = STDIN_FILENO;
+       _cleanup_fd_ int ffd = STDIN_FILENO;
        int err;
        __u32 result;
 
@@ -6524,7 +6524,7 @@ static int sec_send(int argc, char **argv, struct command *cmd, struct plugin *p
 
        _cleanup_nvme_dev_ struct nvme_dev *dev = NULL;
        _cleanup_free_ void *sec_buf = NULL;
-       _cleanup_file_ int sec_fd = -1;
+       _cleanup_fd_ int sec_fd = -1;
        unsigned int sec_size;
        int err;
 
@@ -6633,7 +6633,7 @@ static int dir_send(int argc, char **argv, struct command *cmd, struct plugin *p
        _cleanup_free_ void *buf = NULL;
        __u32 result;
        __u32 dw12 = 0;
-       _cleanup_file_ int ffd = STDIN_FILENO;
+       _cleanup_fd_ int ffd = STDIN_FILENO;
        int err;
 
        struct config {
@@ -7720,7 +7720,7 @@ static int submit_io(int opcode, char *command, const char *desc, int argc, char
        void *buffer;
        _cleanup_free_ void *mbuffer = NULL;
        int err = 0;
-       _cleanup_file_ int dfd = -1, mfd = -1;
+       _cleanup_fd_ int dfd = -1, mfd = -1;
        int flags;
        int mode = 0644;
        __u16 control = 0, nblocks = 0;
@@ -8728,7 +8728,7 @@ static int passthru(int argc, char **argv, bool admin,
 
        _cleanup_huge_ struct nvme_mem_huge mh = { 0, };
        _cleanup_nvme_dev_ struct nvme_dev *dev = NULL;
-       _cleanup_file_ int dfd = -1, mfd = -1;
+       _cleanup_fd_ int dfd = -1, mfd = -1;
        int flags;
        int mode = 0644;
        void *data = NULL;
@@ -9663,7 +9663,7 @@ static int nvme_mi(int argc, char **argv, __u8 admin_opcode, const char *desc)
        void *data = NULL;
        int err = 0;
        bool send;
-       _cleanup_file_ int fd = -1;
+       _cleanup_fd_ int fd = -1;
        int flags;
        _cleanup_huge_ struct nvme_mem_huge mh = { 0, };
        _cleanup_nvme_dev_ struct nvme_dev *dev = NULL;

diff --git a/plugins/solidigm/solidigm-internal-logs.c b/plugins/solidigm/solidigm-internal-logs.c
index ef7a39426e8003687d795cf0788730f5979e1548..f5b57f321a45fa373c2ce201f5d077083c01c4e8 100644 (file)
--- a/plugins/solidigm/solidigm-internal-logs.c
+++ b/plugins/solidigm/solidigm-internal-logs.c
@@ -455,7 +455,7 @@ struct log {
 static int log_save(struct log *log, const char *parent_dir_name, const char *subdir_name,
                    const char *file_name, __u8 *buffer, size_t buf_size)
 {
-       _cleanup_file_ int output = -1;
+       _cleanup_fd_ int output = -1;
        char file_path[PATH_MAX] = {0};
        size_t bytes_remaining = 0;
        int err = 0;

diff --git a/util/cleanup.h b/util/cleanup.h
index 36200f2895964bd46cf28dc9a6300ce024bddd75..0819523d7d4a6e91d4dad8fe282d7c04aa761f6a 100644 (file)
--- a/util/cleanup.h
+++ b/util/cleanup.h
@@ -23,18 +23,18 @@ DECLARE_CLEANUP_FUNC(name, type)            \
 
 static inline void freep(void *p)
 {
-        free(*(void**) p);
+       free(*(void **)p);
 }
 #define _cleanup_free_ __cleanup__(freep)
 
 #define _cleanup_huge_ __cleanup__(nvme_free_huge)
 
-static inline void close_file(int *f)
+static inline void cleanup_fd(int *fd)
 {
-       if (*f > STDERR_FILENO)
-               close(*f);
+       if (*fd > STDERR_FILENO)
+               close(*fd);
 }
-#define _cleanup_file_ __cleanup__(close_file)
+#define _cleanup_fd_ __cleanup__(cleanup_fd)
 
 static inline void cleanup_nvme_root(nvme_root_t *r)
 {
@@ -48,7 +48,9 @@ static inline void free_uri(struct nvme_fabrics_uri **uri)
        if (*uri)
                nvme_free_uri(*uri);
 }
-
 #define _cleanup_uri_ __cleanup__(free_uri)
 
-#endif
+static inline DEFINE_CLEANUP_FUNC(cleanup_file, FILE *, fclose)
+#define _cleanup_file_ __cleanup__(cleanup_file)
+
+#endif /* __CLEANUP_H */