]> www.infradead.org Git - users/sagi/nvme-cli.git/commitdiff
nvme-cli: fix indentation for dir_[send/receive]
authorChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Mon, 1 Oct 2018 18:32:54 +0000 (11:32 -0700)
committerKeith Busch <keith.busch@intel.com>
Mon, 1 Oct 2018 18:50:33 +0000 (12:50 -0600)
This is a cleanup patch to get rid of the inconsistent indentation
for the dir_send() and dir_receive() functions.

Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
nvme.c

diff --git a/nvme.c b/nvme.c
index 8b95a99f6a97bec621131944fa2c397dce95039e..a2c5b3b52e92c177ebb30912d66183e8163ac747 100644 (file)
--- a/nvme.c
+++ b/nvme.c
@@ -3153,106 +3153,106 @@ static int sec_send(int argc, char **argv, struct command *cmd, struct plugin *p
 
 static int dir_send(int argc, char **argv, struct command *cmd, struct plugin *plugin)
 {
-        const char *desc = "Set directive parameters of the "\
-                "specified directive type.";
-        const char *raw_binary = "show infos in binary format";
-        const char *namespace_id = "identifier of desired namespace";
-        const char *data_len = "buffer len (if) data is returned";
-        const char *dtype = "directive type";
-        const char *dspec = "directive specification associated with directive type";
-        const char *doper = "directive operation";
-        const char *endir = "directive enable";
-        const char *ttype = "target directive type to be enabled/disabled";
-        const char *human_readable = "show infos in readable format";
-        int err, fd;
-        __u32 result;
-        __u32 dw12 = 0;
-        void *buf = NULL;
-        int ffd = STDIN_FILENO;
-
-        struct config {
-                char *file;
-                __u32 namespace_id;
-                __u32 data_len;
-                __u16 dspec;
-                __u8  dtype;
-                __u8  doper;
-                __u16 endir;
-                __u8  ttype;
-                int  raw_binary;
-                int  human_readable;
-        };
-
-        struct config cfg = {
-                .file         = "",
-                .namespace_id = 1,
-                .data_len     = 0,
-                .dspec        = 0,
-                .dtype        = 0,
-                .ttype        = 0,
-                .doper        = 0,
-                .endir        = 1,
-        };
-
-        const struct argconfig_commandline_options command_line_options[] = {
-                {"namespace-id",   'n', "NUM", CFG_POSITIVE, &cfg.namespace_id,   required_argument, namespace_id},
-                {"data-len",       'l', "NUM", CFG_POSITIVE, &cfg.data_len,       required_argument, data_len},
-                {"raw-binary",     'b', "FLAG",CFG_NONE,     &cfg.raw_binary,     no_argument,       raw_binary},
-                {"dir-type",       'D', "NUM", CFG_BYTE,     &cfg.dtype,          required_argument, dtype},
-                {"target-dir",     'T', "NUM", CFG_BYTE,     &cfg.ttype,          required_argument, ttype},
-                {"dir-spec",       'S', "NUM", CFG_SHORT,    &cfg.dspec,          required_argument, dspec},
-                {"dir-oper",       'O', "NUM", CFG_BYTE,     &cfg.doper,          required_argument, doper},
-                {"endir",          'e', "NUM", CFG_SHORT,    &cfg.endir,          required_argument, endir},
-                {"human-readable", 'H', "FLAG",CFG_NONE,     &cfg.human_readable, no_argument,       human_readable},
-                {NULL}
-        };
-
-        fd = parse_and_open(argc, argv, desc, command_line_options, &cfg, sizeof(cfg));
+       const char *desc = "Set directive parameters of the "\
+                           "specified directive type.";
+       const char *raw_binary = "show infos in binary format";
+       const char *namespace_id = "identifier of desired namespace";
+       const char *data_len = "buffer len (if) data is returned";
+       const char *dtype = "directive type";
+       const char *dspec = "directive specification associated with directive type";
+       const char *doper = "directive operation";
+       const char *endir = "directive enable";
+       const char *ttype = "target directive type to be enabled/disabled";
+       const char *human_readable = "show infos in readable format";
+       int err, fd;
+       __u32 result;
+       __u32 dw12 = 0;
+       void *buf = NULL;
+       int ffd = STDIN_FILENO;
+
+       struct config {
+               char *file;
+               __u32 namespace_id;
+               __u32 data_len;
+               __u16 dspec;
+               __u8  dtype;
+               __u8  doper;
+               __u16 endir;
+               __u8  ttype;
+               int  raw_binary;
+               int  human_readable;
+       };
+
+       struct config cfg = {
+               .file         = "",
+               .namespace_id = 1,
+               .data_len     = 0,
+               .dspec        = 0,
+               .dtype        = 0,
+               .ttype        = 0,
+               .doper        = 0,
+               .endir        = 1,
+       };
+
+       const struct argconfig_commandline_options command_line_options[] = {
+               {"namespace-id",   'n', "NUM", CFG_POSITIVE, &cfg.namespace_id,   required_argument, namespace_id},
+               {"data-len",       'l', "NUM", CFG_POSITIVE, &cfg.data_len,       required_argument, data_len},
+               {"raw-binary",     'b', "FLAG",CFG_NONE,     &cfg.raw_binary,     no_argument,       raw_binary},
+               {"dir-type",       'D', "NUM", CFG_BYTE,     &cfg.dtype,          required_argument, dtype},
+               {"target-dir",     'T', "NUM", CFG_BYTE,     &cfg.ttype,          required_argument, ttype},
+               {"dir-spec",       'S', "NUM", CFG_SHORT,    &cfg.dspec,          required_argument, dspec},
+               {"dir-oper",       'O', "NUM", CFG_BYTE,     &cfg.doper,          required_argument, doper},
+               {"endir",          'e', "NUM", CFG_SHORT,    &cfg.endir,          required_argument, endir},
+               {"human-readable", 'H', "FLAG",CFG_NONE,     &cfg.human_readable, no_argument,       human_readable},
+               {NULL}
+       };
+
+       fd = parse_and_open(argc, argv, desc, command_line_options, &cfg, sizeof(cfg));
        if (fd < 0)
                return fd;
 
-        switch (cfg.dtype) {
-        case NVME_DIR_IDENTIFY:
-                switch (cfg.doper) {
-                case NVME_DIR_SND_ID_OP_ENABLE:
-                        if (!cfg.ttype) {
-                                fprintf(stderr, "target-dir required param\n");
-                                err = EINVAL;
+       switch (cfg.dtype) {
+       case NVME_DIR_IDENTIFY:
+               switch (cfg.doper) {
+               case NVME_DIR_SND_ID_OP_ENABLE:
+                       if (!cfg.ttype) {
+                               fprintf(stderr, "target-dir required param\n");
+                               err = EINVAL;
                                goto close_fd;
-                        }
-                        dw12 = cfg.ttype << 8 | cfg.endir;
-                        break;
-                default:
-                        fprintf(stderr, "invalid directive operations for Identify Directives\n");
-                        err = EINVAL;
+                       }
+                       dw12 = cfg.ttype << 8 | cfg.endir;
+                       break;
+               default:
+                       fprintf(stderr, "invalid directive operations for Identify Directives\n");
+                       err = EINVAL;
                        goto close_fd;
-                }
-                break;
-        case NVME_DIR_STREAMS:
-                switch (cfg.doper) {
-                case NVME_DIR_SND_ST_OP_REL_ID:
-                case NVME_DIR_SND_ST_OP_REL_RSC:
-                        break;
-                default:
-                        fprintf(stderr, "invalid directive operations for Streams Directives\n");
-                        err = EINVAL;
+               }
+               break;
+       case NVME_DIR_STREAMS:
+               switch (cfg.doper) {
+               case NVME_DIR_SND_ST_OP_REL_ID:
+               case NVME_DIR_SND_ST_OP_REL_RSC:
+                       break;
+               default:
+                       fprintf(stderr, "invalid directive operations for Streams Directives\n");
+                       err = EINVAL;
                        goto close_fd;
-                }
-                break;
-        default:
-                fprintf(stderr, "invalid directive type\n");
-                err = EINVAL;
+               }
+               break;
+       default:
+               fprintf(stderr, "invalid directive type\n");
+               err = EINVAL;
                goto close_fd;
-        }
+       }
 
 
-        if (cfg.data_len) {
-                if (posix_memalign(&buf, getpagesize(), cfg.data_len)) {
+       if (cfg.data_len) {
+               if (posix_memalign(&buf, getpagesize(), cfg.data_len)) {
                        err = ENOMEM;
                        goto close_fd;
                }
-                memset(buf, 0, cfg.data_len);
-        }
+               memset(buf, 0, cfg.data_len);
+       }
 
         if (buf) {
                 if (strlen(cfg.file)) {
@@ -3271,34 +3271,34 @@ static int dir_send(int argc, char **argv, struct command *cmd, struct plugin *p
                 }
         }
 
-        err = nvme_dir_send(fd, cfg.namespace_id, cfg.dspec, cfg.dtype, cfg.doper,
-                                cfg.data_len, dw12, buf, &result);
-        if (err < 0) {
-                perror("dir-send");
+       err = nvme_dir_send(fd, cfg.namespace_id, cfg.dspec, cfg.dtype, cfg.doper,
+                       cfg.data_len, dw12, buf, &result);
+       if (err < 0) {
+               perror("dir-send");
                goto close_ffd;
-        }
-        if (!err) {
-                printf("dir-send: type %#x, operation %#x, spec_val %#x, nsid %#x, result %#x \n",
-                                cfg.dtype, cfg.doper, cfg.dspec, cfg.namespace_id, result);
-                if (buf) {
-                        if (!cfg.raw_binary)
-                                d(buf, cfg.data_len, 16, 1);
-                        else
-                                d_raw(buf, cfg.data_len);
-                }
-        }
-        else if (err > 0)
-                fprintf(stderr, "NVMe Status:%s(%x)\n",
-                                nvme_status_to_string(err), err);
+       }
+       if (!err) {
+               printf("dir-send: type %#x, operation %#x, spec_val %#x, nsid %#x, result %#x \n",
+                               cfg.dtype, cfg.doper, cfg.dspec, cfg.namespace_id, result);
+               if (buf) {
+                       if (!cfg.raw_binary)
+                               d(buf, cfg.data_len, 16, 1);
+                       else
+                               d_raw(buf, cfg.data_len);
+               }
+       }
+       else if (err > 0)
+               fprintf(stderr, "NVMe Status:%s(%x)\n",
+                               nvme_status_to_string(err), err);
 
- close_ffd:
+close_ffd:
        close(ffd);
- free:
-        if (buf)
-                free(buf);
- close_fd:
+free:
+       if (buf)
+               free(buf);
+close_fd:
        close(fd);
-        return err;
+       return err;
 }
 
 static int write_uncor(int argc, char **argv, struct command *cmd, struct plugin *plugin)
@@ -4260,131 +4260,131 @@ static int sec_recv(int argc, char **argv, struct command *cmd, struct plugin *p
 
 static int dir_receive(int argc, char **argv, struct command *cmd, struct plugin *plugin)
 {
-        const char *desc = "Read directive parameters of the "\
-                "specified directive type.";
-        const char *raw_binary = "show infos in binary format";
-        const char *namespace_id = "identifier of desired namespace";
-        const char *data_len = "buffer len (if) data is returned";
-        const char *dtype = "directive type";
-        const char *dspec = "directive specification associated with directive type";
-        const char *doper = "directive operation";
-        const char *nsr = "namespace stream requested";
-        const char *human_readable = "show infos in readable format";
-        int err, fd;
-        __u32 result;
-        __u32 dw12 = 0;
-        void *buf = NULL;
-
-        struct config {
-                __u32 namespace_id;
-                __u32 data_len;
-                __u16 dspec;
-                __u8  dtype;
-                __u8  doper;
-                __u16 nsr; /* dw12 for NVME_DIR_ST_RCVOP_STATUS */
-                int  raw_binary;
-                int  human_readable;
-        };
-
-        struct config cfg = {
-                .namespace_id = 1,
-                .data_len     = 0,
-                .dspec        = 0,
-                .dtype        = 0,
-                .doper        = 0,
-                .nsr          = 0,
-        };
-
-        const struct argconfig_commandline_options command_line_options[] = {
-                {"namespace-id",   'n', "NUM", CFG_POSITIVE, &cfg.namespace_id,   required_argument, namespace_id},
-                {"data-len",       'l', "NUM", CFG_POSITIVE, &cfg.data_len,       required_argument, data_len},
-                {"raw-binary",     'b', "FLAG",CFG_NONE,     &cfg.raw_binary,     no_argument,       raw_binary},
-                {"dir-type",       'D', "NUM", CFG_BYTE,     &cfg.dtype,          required_argument, dtype},
-                {"dir-spec",       'S', "NUM", CFG_SHORT,    &cfg.dspec,          required_argument, dspec},
-                {"dir-oper",       'O', "NUM", CFG_BYTE,     &cfg.doper,          required_argument, doper},
-                {"req-resource",   'r', "NUM", CFG_SHORT,    &cfg.nsr,            required_argument, nsr},
-                {"human-readable", 'H', "FLAG",CFG_NONE,     &cfg.human_readable, no_argument,       human_readable},
-                {NULL}
-        };
-
-        fd = parse_and_open(argc, argv, desc, command_line_options, &cfg, sizeof(cfg));
+       const char *desc = "Read directive parameters of the "\
+                           "specified directive type.";
+       const char *raw_binary = "show infos in binary format";
+       const char *namespace_id = "identifier of desired namespace";
+       const char *data_len = "buffer len (if) data is returned";
+       const char *dtype = "directive type";
+       const char *dspec = "directive specification associated with directive type";
+       const char *doper = "directive operation";
+       const char *nsr = "namespace stream requested";
+       const char *human_readable = "show infos in readable format";
+       int err, fd;
+       __u32 result;
+       __u32 dw12 = 0;
+       void *buf = NULL;
+
+       struct config {
+               __u32 namespace_id;
+               __u32 data_len;
+               __u16 dspec;
+               __u8  dtype;
+               __u8  doper;
+               __u16 nsr; /* dw12 for NVME_DIR_ST_RCVOP_STATUS */
+               int  raw_binary;
+               int  human_readable;
+       };
+
+       struct config cfg = {
+               .namespace_id = 1,
+               .data_len     = 0,
+               .dspec        = 0,
+               .dtype        = 0,
+               .doper        = 0,
+               .nsr          = 0,
+       };
+
+       const struct argconfig_commandline_options command_line_options[] = {
+               {"namespace-id",   'n', "NUM", CFG_POSITIVE, &cfg.namespace_id,   required_argument, namespace_id},
+               {"data-len",       'l', "NUM", CFG_POSITIVE, &cfg.data_len,       required_argument, data_len},
+               {"raw-binary",     'b', "FLAG",CFG_NONE,     &cfg.raw_binary,     no_argument,       raw_binary},
+               {"dir-type",       'D', "NUM", CFG_BYTE,     &cfg.dtype,          required_argument, dtype},
+               {"dir-spec",       'S', "NUM", CFG_SHORT,    &cfg.dspec,          required_argument, dspec},
+               {"dir-oper",       'O', "NUM", CFG_BYTE,     &cfg.doper,          required_argument, doper},
+               {"req-resource",   'r', "NUM", CFG_SHORT,    &cfg.nsr,            required_argument, nsr},
+               {"human-readable", 'H', "FLAG",CFG_NONE,     &cfg.human_readable, no_argument,       human_readable},
+               {NULL}
+       };
+
+       fd = parse_and_open(argc, argv, desc, command_line_options, &cfg, sizeof(cfg));
        if (fd < 0)
                return fd;
 
-        switch (cfg.dtype) {
-        case NVME_DIR_IDENTIFY:
-                switch (cfg.doper) {
-                case NVME_DIR_RCV_ID_OP_PARAM:
-                        if (!cfg.data_len)
-                                cfg.data_len = 4096;
-                        break;
-                default:
-                        fprintf(stderr, "invalid directive operations for Identify Directives\n");
-                        err = EINVAL;
+       switch (cfg.dtype) {
+       case NVME_DIR_IDENTIFY:
+               switch (cfg.doper) {
+               case NVME_DIR_RCV_ID_OP_PARAM:
+                       if (!cfg.data_len)
+                               cfg.data_len = 4096;
+                       break;
+               default:
+                       fprintf(stderr, "invalid directive operations for Identify Directives\n");
+                       err = EINVAL;
                        goto close_fd;
-                }
-                break;
-        case NVME_DIR_STREAMS:
-                switch (cfg.doper) {
-                case NVME_DIR_RCV_ST_OP_PARAM:
-                        if (!cfg.data_len)
-                                cfg.data_len = 32;
-                        break;
-                case NVME_DIR_RCV_ST_OP_STATUS:
-                        if (!cfg.data_len)
-                                cfg.data_len = 128 * 1024;
-                        break;
-                case NVME_DIR_RCV_ST_OP_RESOURCE:
-                        dw12 = cfg.nsr;
-                        break;
-                default:
-                        fprintf(stderr, "invalid directive operations for Streams Directives\n");
-                        err = EINVAL;
+               }
+               break;
+       case NVME_DIR_STREAMS:
+               switch (cfg.doper) {
+               case NVME_DIR_RCV_ST_OP_PARAM:
+                       if (!cfg.data_len)
+                               cfg.data_len = 32;
+                       break;
+               case NVME_DIR_RCV_ST_OP_STATUS:
+                       if (!cfg.data_len)
+                               cfg.data_len = 128 * 1024;
+                       break;
+               case NVME_DIR_RCV_ST_OP_RESOURCE:
+                       dw12 = cfg.nsr;
+                       break;
+               default:
+                       fprintf(stderr, "invalid directive operations for Streams Directives\n");
+                       err = EINVAL;
                        goto close_fd;
-                }
-                break;
-        default:
-                fprintf(stderr, "invalid directive type\n");
-                err = EINVAL;
+               }
+               break;
+       default:
+               fprintf(stderr, "invalid directive type\n");
+               err = EINVAL;
                goto close_fd;
-        }
+       }
 
-        if (cfg.data_len) {
-                if (posix_memalign(&buf, getpagesize(), cfg.data_len)) {
+       if (cfg.data_len) {
+               if (posix_memalign(&buf, getpagesize(), cfg.data_len)) {
                        err = ENOMEM;
                        goto close_fd;
                }
-                memset(buf, 0, cfg.data_len);
-        }
+               memset(buf, 0, cfg.data_len);
+       }
 
-        err = nvme_dir_recv(fd, cfg.namespace_id, cfg.dspec, cfg.dtype, cfg.doper,
-                        cfg.data_len, dw12, buf, &result);
-        if (err < 0) {
-                perror("dir-receive");
+       err = nvme_dir_recv(fd, cfg.namespace_id, cfg.dspec, cfg.dtype, cfg.doper,
+                       cfg.data_len, dw12, buf, &result);
+       if (err < 0) {
+               perror("dir-receive");
                goto free;
-        }
+       }
 
-        if (!err) {
-                printf("dir-receive: type %#x, operation %#x, spec %#x, nsid %#x, result %#x \n",
-                                cfg.dtype, cfg.doper, cfg.dspec, cfg.namespace_id, result);
-                if (cfg.human_readable)
-                        nvme_directive_show_fields(cfg.dtype, cfg.doper, result, buf);
-                else {
-                        if (buf) {
-                                if (!cfg.raw_binary)
-                                        d(buf, cfg.data_len, 16, 1);
-                                else
-                                        d_raw(buf, cfg.data_len);
-                        }
-                }
-        }
-        else if (err > 0)
-                fprintf(stderr, "NVMe Status:%s(%x)\n",
-                                nvme_status_to_string(err), err);
- free:
+       if (!err) {
+               printf("dir-receive: type %#x, operation %#x, spec %#x, nsid %#x, result %#x \n",
+                               cfg.dtype, cfg.doper, cfg.dspec, cfg.namespace_id, result);
+               if (cfg.human_readable)
+                       nvme_directive_show_fields(cfg.dtype, cfg.doper, result, buf);
+               else {
+                       if (buf) {
+                               if (!cfg.raw_binary)
+                                       d(buf, cfg.data_len, 16, 1);
+                               else
+                                       d_raw(buf, cfg.data_len);
+                       }
+               }
+       }
+       else if (err > 0)
+               fprintf(stderr, "NVMe Status:%s(%x)\n",
+                               nvme_status_to_string(err), err);
+free:
        if (cfg.data_len)
                free(buf);
- close_fd:
+close_fd:
        close(fd);
        return err;
 }