argconfig: Remove unused paramters

Signed-off-by: Keith Busch <kbusch@kernel.org>

diff --git a/fabrics.c b/fabrics.c
index 8982ae4fce50e3b299bed6f7cb2b591d5c9b5656..5cc6181caafe4c91d39774170f27d1a2d6440017 100644 (file)
--- a/fabrics.c
+++ b/fabrics.c
@@ -1123,7 +1123,7 @@ static int discover_from_conf_file(const char *desc, char *argstr,
                while ((ptr = strsep(&args, " =\n")) != NULL)
                        argv[argc++] = ptr;
 
-               err = argconfig_parse(argc, argv, desc, opts, &cfg, sizeof(cfg));
+               err = argconfig_parse(argc, argv, desc, opts);
                if (err)
                        continue;
 
@@ -1181,7 +1181,7 @@ int discover(const char *desc, int argc, char **argv, bool connect)
        };
 
        cfg.tos = -1;
-       ret = argconfig_parse(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       ret = argconfig_parse(argc, argv, desc, opts);
        if (ret)
                goto out;
 
@@ -1235,7 +1235,7 @@ int connect(const char *desc, int argc, char **argv)
        };
 
        cfg.tos = -1;
-       ret = argconfig_parse(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       ret = argconfig_parse(argc, argv, desc, opts);
        if (ret)
                goto out;
 
@@ -1351,7 +1351,7 @@ int disconnect(const char *desc, int argc, char **argv)
                OPT_END()
        };
 
-       ret = argconfig_parse(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       ret = argconfig_parse(argc, argv, desc, opts);
        if (ret)
                goto out;
 
@@ -1393,7 +1393,7 @@ int disconnect_all(const char *desc, int argc, char **argv)
                OPT_END()
        };
 
-       ret = argconfig_parse(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       ret = argconfig_parse(argc, argv, desc, opts);
        if (ret)
                goto out;
 

diff --git a/nvme.c b/nvme.c
index 254bc7e3283db942d493cff113292d18d8520c9a..4aff6d352c14486f42656b9702230d822de4257b 100644 (file)
--- a/nvme.c
+++ b/nvme.c
@@ -191,17 +191,17 @@ static int get_dev(int argc, char **argv)
 }
 
 int parse_and_open(int argc, char **argv, const char *desc,
-       const struct argconfig_commandline_options *clo, void *cfg, size_t size)
+       const struct argconfig_commandline_options *opts)
 {
        int ret;
 
-       ret = argconfig_parse(argc, argv, desc, clo, cfg, size);
+       ret = argconfig_parse(argc, argv, desc, opts);
        if (ret)
                return ret;
 
        ret = get_dev(argc, argv);
        if (ret < 0)
-               argconfig_print_help(desc, clo);
+               argconfig_print_help(desc, opts);
 
        return ret;
 }
@@ -248,11 +248,9 @@ static int get_smart_log(int argc, char **argv, struct command *cmd, struct plug
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        fmt = validate_output_format(cfg.output_format);
        if (fmt < 0) {
@@ -277,7 +275,6 @@ static int get_smart_log(int argc, char **argv, struct command *cmd, struct plug
 
 close_fd:
        close(fd);
-
 ret:
        return nvme_status_to_errno(err, false);
 }
@@ -307,11 +304,9 @@ static int get_ana_log(int argc, char **argv, struct command *cmd,
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, NULL, 0);
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        fmt = validate_output_format(cfg.output_format);
        if (fmt < 0) {
@@ -391,11 +386,9 @@ static int get_telemetry_log(int argc, char **argv, struct command *cmd, struct
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        if (!cfg.file_name) {
                fprintf(stderr, "Please provide an output file!\n");
@@ -513,11 +506,9 @@ static int get_endurance_log(int argc, char **argv, struct command *cmd, struct
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        fmt = validate_output_format(cfg.output_format);
        if (fmt < 0) {
@@ -572,11 +563,9 @@ static int get_effects_log(int argc, char **argv, struct command *cmd, struct pl
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        fmt = validate_output_format(cfg.output_format);
        if (fmt < 0) {
@@ -637,11 +626,9 @@ static int get_error_log(int argc, char **argv, struct command *cmd, struct plug
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        fmt = validate_output_format(cfg.output_format);
        if (fmt < 0) {
@@ -719,11 +706,9 @@ static int get_fw_log(int argc, char **argv, struct command *cmd, struct plugin
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        fmt = validate_output_format(cfg.output_format);
        if (fmt < 0) {
@@ -777,11 +762,9 @@ static int get_changed_ns_list_log(int argc, char **argv, struct command *cmd, s
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        fmt = validate_output_format(cfg.output_format);
        if (fmt < 0) {
@@ -862,11 +845,9 @@ static int get_log(int argc, char **argv, struct command *cmd, struct plugin *pl
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        if (cfg.aen) {
                cfg.log_len = 4096;
@@ -943,11 +924,9 @@ static int sanitize_log(int argc, char **argv, struct command *command, struct p
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               ret = fd;
+       ret = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        fmt = validate_output_format(cfg.output_format);
        if (fmt < 0) {
@@ -1004,11 +983,9 @@ static int list_ctrl(int argc, char **argv, struct command *cmd, struct plugin *
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        if (posix_memalign((void *)&cntlist, getpagesize(), 0x1000)) {
                fprintf(stderr, "can not allocate controller list payload\n");
@@ -1060,11 +1037,9 @@ static int list_ns(int argc, char **argv, struct command *cmd, struct plugin *pl
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        if (!cfg.namespace_id) {
                err = -EINVAL;
@@ -1118,11 +1093,9 @@ static int delete_ns(int argc, char **argv, struct command *cmd, struct plugin *
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        if (S_ISBLK(nvme_stat.st_mode)) {
                cfg.namespace_id = get_nsid(fd);
@@ -1176,11 +1149,9 @@ static int nvme_attach_ns(int argc, char **argv, int attach, const char *desc, s
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        if (!cfg.namespace_id) {
                fprintf(stderr, "%s: namespace-id parameter required\n",
@@ -1283,11 +1254,9 @@ static int create_ns(int argc, char **argv, struct command *cmd, struct plugin *
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        if (cfg.flbas != 0xff && cfg.bs != 0x00) {
                fprintf(stderr,
@@ -1369,7 +1338,7 @@ static int list_subsys(int argc, char **argv, struct command *cmd,
                OPT_END()
        };
 
-       ret = argconfig_parse(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       ret = argconfig_parse(argc, argv, desc, opts);
        if (ret < 0)
                goto ret;
 
@@ -1447,7 +1416,7 @@ static int list(int argc, char **argv, struct command *cmd, struct plugin *plugi
                OPT_END()
        };
 
-       ret = argconfig_parse(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       ret = argconfig_parse(argc, argv, desc, opts);
        if (ret < 0)
                return ret;
 
@@ -1580,11 +1549,9 @@ int __id_ctrl(int argc, char **argv, struct command *cmd, struct plugin *plugin,
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        fmt = validate_output_format(cfg.output_format);
        if (fmt < 0) {
@@ -1655,11 +1622,9 @@ static int ns_descs(int argc, char **argv, struct command *cmd, struct plugin *p
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        fmt = validate_output_format(cfg.output_format);
        if (fmt < 0) {
@@ -1745,11 +1710,9 @@ static int id_ns(int argc, char **argv, struct command *cmd, struct plugin *plug
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        fmt = validate_output_format(cfg.output_format);
        if (fmt < 0) {
@@ -1817,11 +1780,9 @@ static int id_ns_granularity(int argc, char **argv, struct command *cmd, struct
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        fmt = validate_output_format(cfg.output_format);
        if (fmt < 0) {
@@ -1881,11 +1842,9 @@ static int id_nvmset(int argc, char **argv, struct command *cmd, struct plugin *
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        fmt = validate_output_format(cfg.output_format);
        if (fmt < 0) {
@@ -1941,7 +1900,7 @@ static int id_uuid(int argc, char **argv, struct command *cmd, struct plugin *pl
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -1984,11 +1943,9 @@ static int get_ns_id(int argc, char **argv, struct command *cmd, struct plugin *
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, NULL, 0);
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        nsid = nvme_get_nsid(fd);
        if (nsid <= 0) {
@@ -2048,11 +2005,9 @@ static int virtual_mgmt(int argc, char **argv, struct command *cmd, struct plugi
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        cfg.cdw10 = cfg.cntlid << 16;
        cfg.cdw10 = cfg.cdw10 | (cfg.rt << 8);
@@ -2103,11 +2058,9 @@ static int list_secondary_ctrl(int argc, char **argv, struct command *cmd, struc
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        fmt = validate_output_format(cfg.output_format);
        if (fmt < 0) {
@@ -2177,11 +2130,9 @@ static int device_self_test(int argc, char **argv, struct command *cmd, struct p
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        err = nvme_self_test_start(fd, cfg.namespace_id, cfg.cdw10);
        if (!err) {
@@ -2225,11 +2176,9 @@ static int self_test_log(int argc, char **argv, struct command *cmd, struct plug
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        fmt = validate_output_format(cfg.output_format);
        if (fmt < 0) {
@@ -2313,11 +2262,9 @@ static int get_feature(int argc, char **argv, struct command *cmd, struct plugin
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        if (cfg.sel > 7) {
                fprintf(stderr, "invalid 'select' param:%d\n", cfg.sel);
@@ -2436,11 +2383,9 @@ static int fw_download(int argc, char **argv, struct command *cmd, struct plugin
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        fw_fd = open(cfg.fw, O_RDONLY);
        cfg.offset <<= 2;
@@ -2549,11 +2494,9 @@ static int fw_commit(int argc, char **argv, struct command *cmd, struct plugin *
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        if (cfg.slot > 7) {
                fprintf(stderr, "invalid slot:%d\n", cfg.slot);
@@ -2612,11 +2555,9 @@ static int subsystem_reset(int argc, char **argv, struct command *cmd, struct pl
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, NULL, 0);
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        err = nvme_subsystem_reset(fd);
        if (err < 0) {
@@ -2641,11 +2582,9 @@ static int reset(int argc, char **argv, struct command *cmd, struct plugin *plug
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, NULL, 0);
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        err = nvme_reset_controller(fd);
        if (err < 0)
@@ -2665,11 +2604,9 @@ static int ns_rescan(int argc, char **argv, struct command *cmd, struct plugin *
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, NULL, 0);
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        err = nvme_ns_rescan(fd);
        if (err < 0)
@@ -2690,8 +2627,7 @@ static int sanitize(int argc, char **argv, struct command *cmd, struct plugin *p
        const char *sanact_desc = "Sanitize action.";
        const char *ovrpat_desc = "Overwrite pattern.";
 
-       int fd;
-       int ret;
+       int fd, ret;
 
        struct config {
                int    no_dealloc;
@@ -2721,11 +2657,9 @@ static int sanitize(int argc, char **argv, struct command *cmd, struct plugin *p
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, NULL, 0);
-       if (fd < 0) {
-               ret = fd;
+       ret = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        switch (cfg.sanact) {
        case NVME_SANITIZE_ACT_CRYPTO_ERASE:
@@ -2801,11 +2735,9 @@ static int show_registers(int argc, char **argv, struct command *cmd, struct plu
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        fmt = validate_output_format(cfg.output_format);
        if (fmt < 0) {
@@ -2876,11 +2808,9 @@ static int get_property(int argc, char **argv, struct command *cmd, struct plugi
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        if (cfg.offset == -1) {
                fprintf(stderr, "offset required param");
@@ -2927,11 +2857,9 @@ static int set_property(int argc, char **argv, struct command *cmd, struct plugi
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        if (cfg.offset == -1) {
                fprintf(stderr, "offset required param");
@@ -3020,11 +2948,9 @@ static int format(int argc, char **argv, struct command *cmd, struct plugin *plu
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        if (cfg.lbaf != 0xff && cfg.bs !=0) {
                fprintf(stderr,
@@ -3223,11 +3149,9 @@ static int set_feature(int argc, char **argv, struct command *cmd, struct plugin
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        if (!cfg.feature_id) {
                fprintf(stderr, "feature-id required param\n");
@@ -3337,11 +3261,9 @@ static int sec_send(int argc, char **argv, struct command *cmd, struct plugin *p
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        sec_fd = open(cfg.file, O_RDONLY);
        if (sec_fd < 0) {
@@ -3447,11 +3369,9 @@ static int dir_send(int argc, char **argv, struct command *cmd, struct plugin *p
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        switch (cfg.dtype) {
        case NVME_DIR_IDENTIFY:
@@ -3573,11 +3493,9 @@ static int write_uncor(int argc, char **argv, struct command *cmd, struct plugin
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        if (!cfg.namespace_id) {
                cfg.namespace_id = get_nsid(fd);
@@ -3655,11 +3573,9 @@ static int write_zeroes(int argc, char **argv, struct command *cmd, struct plugi
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        if (cfg.prinfo > 0xf) {
                err = -EINVAL;
@@ -3752,11 +3668,9 @@ static int dsm(int argc, char **argv, struct command *cmd, struct plugin *plugin
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        nc = argconfig_parse_comma_sep_array(cfg.ctx_attrs, ctx_attrs, ARRAY_SIZE(ctx_attrs));
        nb = argconfig_parse_comma_sep_array(cfg.blocks, nlbs, ARRAY_SIZE(nlbs));
@@ -3822,11 +3736,9 @@ static int flush(int argc, char **argv, struct command *cmd, struct plugin *plug
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        if (S_ISBLK(nvme_stat.st_mode)) {
                cfg.namespace_id = get_nsid(fd);
@@ -3892,11 +3804,9 @@ static int resv_acquire(int argc, char **argv, struct command *cmd, struct plugi
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        if (!cfg.namespace_id) {
                cfg.namespace_id = get_nsid(fd);
@@ -3966,11 +3876,9 @@ static int resv_register(int argc, char **argv, struct command *cmd, struct plug
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        if (!cfg.namespace_id) {
                cfg.namespace_id = get_nsid(fd);
@@ -4048,11 +3956,9 @@ static int resv_release(int argc, char **argv, struct command *cmd, struct plugi
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        if (!cfg.namespace_id) {
                cfg.namespace_id = get_nsid(fd);
@@ -4121,11 +4027,9 @@ static int resv_report(int argc, char **argv, struct command *cmd, struct plugin
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        fmt = validate_output_format(cfg.output_format);
        if (fmt < 0) {
@@ -4277,11 +4181,9 @@ static int submit_io(int opcode, char *command, const char *desc,
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        dfd = mfd = opcode & 1 ? STDIN_FILENO : STDOUT_FILENO;
        if (cfg.prinfo > 0xf) {
@@ -4512,7 +4414,7 @@ static int verify_cmd(int argc, char **argv, struct command *cmd, struct plugin
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       err = fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -4596,11 +4498,9 @@ static int sec_recv(int argc, char **argv, struct command *cmd, struct plugin *p
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        if (cfg.size) {
                if (posix_memalign(&sec_buf, getpagesize(), cfg.size)) {
@@ -4677,8 +4577,7 @@ static int get_lba_status(int argc, char **argv, struct command *cmd,
                OPT_END()
        };
 
-       err = fd = parse_and_open(argc, argv, desc, opts, &cfg,
-                       sizeof(cfg));
+       err = fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                goto ret;
 
@@ -4766,11 +4665,9 @@ static int dir_receive(int argc, char **argv, struct command *cmd, struct plugin
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        switch (cfg.dtype) {
        case NVME_DIR_IDENTIFY:
@@ -4951,11 +4848,9 @@ static int passthru(int argc, char **argv, int ioctl_cmd, const char *desc, stru
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-       if (fd < 0) {
-               err = fd;
+       err = fd = parse_and_open(argc, argv, desc, opts);
+       if (fd < 0)
                goto ret;
-       }
 
        if (strlen(cfg.input_file)){
                wfd = open(cfg.input_file, O_RDONLY,

diff --git a/nvme.h b/nvme.h
index 84a9987e3c841f922bb7e31580b934e8a7deff52..e5ac92a44346bc94ea380fbd0125a7c8520929e7 100644 (file)
--- a/nvme.h
+++ b/nvme.h
@@ -239,7 +239,7 @@ void register_extension(struct plugin *plugin);
 
 #include "util/argconfig.h"
 int parse_and_open(int argc, char **argv, const char *desc,
-       const struct argconfig_commandline_options *clo, void *cfg, size_t size);
+       const struct argconfig_commandline_options *clo);
 
 extern const char *devicename;
 

diff --git a/plugins/huawei/huawei-nvme.c b/plugins/huawei/huawei-nvme.c
index 55282374b06b6ebbd2897b586dc5b0ebeae3bfeb..d291dab59a129a43400749d29e455f9abb2d2755 100644 (file)
--- a/plugins/huawei/huawei-nvme.c
+++ b/plugins/huawei/huawei-nvme.c
@@ -316,8 +316,7 @@ static int huawei_list(int argc, char **argv, struct command *command,
                OPT_END()
        };
 
-       argconfig_parse(argc, argv, desc, opts, &cfg, sizeof(cfg));
-
+       argconfig_parse(argc, argv, desc, opts);
        fmt = validate_output_format(cfg.output_format);
        if (fmt != JSON && fmt != NORMAL)
                return -EINVAL;

diff --git a/plugins/intel/intel-nvme.c b/plugins/intel/intel-nvme.c
index 44e4d5d12b2ee58d8efa0bd1ce08a48d71d55afe..68140009730db5b86cb31df35990b105c78a895d 100644 (file)
--- a/plugins/intel/intel-nvme.c
+++ b/plugins/intel/intel-nvme.c
@@ -292,7 +292,7 @@ static int get_additional_smart_log(int argc, char **argv, struct command *cmd,
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -331,7 +331,7 @@ static int get_market_log(int argc, char **argv, struct command *cmd, struct plu
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -393,7 +393,7 @@ static int get_temp_stats_log(int argc, char **argv, struct command *cmd, struct
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -462,7 +462,7 @@ static int get_lat_stats_log(int argc, char **argv, struct command *cmd, struct
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -727,7 +727,7 @@ static int get_internal_log(int argc, char **argv, struct command *command, stru
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0) {
                free(intel);
                return fd;

diff --git a/plugins/lnvm/lnvm-nvme.c b/plugins/lnvm/lnvm-nvme.c
index 35e98b7b8f042e6937335b8dac598999858d1aba..23c1c4b7d8e2d8d7fa316fad6b478a4eba8c101e 100644 (file)
--- a/plugins/lnvm/lnvm-nvme.c
+++ b/plugins/lnvm/lnvm-nvme.c
@@ -44,7 +44,7 @@ static int lnvm_init(int argc, char **argv, struct command *cmd, struct plugin *
                OPT_END()
        };
 
-       ret = argconfig_parse(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       ret = argconfig_parse(argc, argv, desc, opts);
        if (ret < 0)
                return ret;
 
@@ -65,7 +65,7 @@ static int lnvm_list(int argc, char **argv, struct command *cmd, struct plugin *
                OPT_END()
        };
 
-       ret = argconfig_parse(argc, argv, desc, opts, NULL, 0);
+       ret = argconfig_parse(argc, argv, desc, opts);
        if (ret < 0)
                return ret;
 
@@ -81,7 +81,7 @@ static int lnvm_info(int argc, char **argv, struct command *cmd, struct plugin *
                OPT_END()
        };
 
-       ret = argconfig_parse(argc, argv, desc, opts, NULL, 0);
+       ret = argconfig_parse(argc, argv, desc, opts);
        if (ret < 0)
                return ret;
 
@@ -116,7 +116,7 @@ static int lnvm_id_ns(int argc, char **argv, struct command *cmd, struct plugin
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -161,8 +161,7 @@ static int lnvm_chunk_log(int argc, char **argv, struct command *cmd, struct plu
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg,
-                               sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -253,7 +252,7 @@ static int lnvm_create_tgt(int argc, char **argv, struct command *cmd, struct pl
                OPT_END()
        };
 
-       ret = argconfig_parse(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       ret = argconfig_parse(argc, argv, desc, opts);
        if (ret < 0)
                return ret;
 
@@ -296,7 +295,7 @@ static int lnvm_remove_tgt(int argc, char **argv, struct command *cmd, struct pl
                OPT_END()
        };
 
-       ret = argconfig_parse(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       ret = argconfig_parse(argc, argv, desc, opts);
        if (ret < 0)
                return ret;
 
@@ -336,8 +335,7 @@ static int lnvm_factory_init(int argc, char **argv, struct command *cmd, struct
                OPT_END()
        };
 
-       ret = argconfig_parse(argc, argv, desc, opts, &cfg,
-                                                               sizeof(cfg));
+       ret = argconfig_parse(argc, argv, desc, opts);
        if (ret < 0)
                return ret;
 
@@ -381,7 +379,7 @@ static int lnvm_get_bbtbl(int argc, char **argv, struct command *cmd, struct plu
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
 
        if (cfg.raw_binary)
                flags |= RAW;
@@ -429,7 +427,7 @@ static int lnvm_set_bbtbl(int argc, char **argv, struct command *cmd, struct plu
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
 
        printf("Updating: Ch.: %u LUN: %u Plane: %u Block: %u -> %u\n",
                        cfg.chid, cfg.lunid, cfg.plnid, cfg.blkid, cfg.value);

diff --git a/plugins/memblaze/memblaze-nvme.c b/plugins/memblaze/memblaze-nvme.c
index 6de6c771ff4a42013c173f5462cc241bbedc728b..387548f072fba9035cb21db4d2ba8f39f6e8abca 100755 (executable)
--- a/plugins/memblaze/memblaze-nvme.c
+++ b/plugins/memblaze/memblaze-nvme.c
@@ -255,7 +255,7 @@ static int get_additional_smart_log(int argc, char **argv, struct command *cmd,
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -335,7 +335,7 @@ static int get_additional_feature(int argc, char **argv, struct command *cmd, st
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -430,7 +430,7 @@ static int set_additional_feature(int argc, char **argv, struct command *cmd, st
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 

diff --git a/plugins/micron/micron-nvme.c b/plugins/micron/micron-nvme.c
index 87bc1de27b6df5e3276b9b05e48b6facbe7e143c..33c23c9062697399415e66863ce30a317b97ac38 100644 (file)
--- a/plugins/micron/micron-nvme.c
+++ b/plugins/micron/micron-nvme.c
@@ -58,8 +58,7 @@ static int micron_selective_download(int argc, char **argv, struct command *cmd,
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
-
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 

diff --git a/plugins/netapp/netapp-nvme.c b/plugins/netapp/netapp-nvme.c
index 9df7a2cdc40e6a7f1a7788e164fecd1a38c3ef2d..d1838b4a675fcf3d8f2aa5a0e8ce5d171289e221 100644 (file)
--- a/plugins/netapp/netapp-nvme.c
+++ b/plugins/netapp/netapp-nvme.c
@@ -521,7 +521,7 @@ static int netapp_smdevices(int argc, char **argv, struct command *command,
                OPT_END()
        };
 
-       ret = argconfig_parse(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       ret = argconfig_parse(argc, argv, desc, opts);
        if (ret < 0)
                return ret;
 
@@ -592,7 +592,7 @@ static int netapp_ontapdevices(int argc, char **argv, struct command *command,
                OPT_END()
        };
 
-       ret = argconfig_parse(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       ret = argconfig_parse(argc, argv, desc, opts);
        if (ret < 0)
                return ret;
 

diff --git a/plugins/seagate/seagate-nvme.c b/plugins/seagate/seagate-nvme.c
index 322a37a6757076ae1d5cec118aaec76fc0330a8c..7ba14f8829bc705eedde2587e72f91ecefdd50c6 100644 (file)
--- a/plugins/seagate/seagate-nvme.c
+++ b/plugins/seagate/seagate-nvme.c
@@ -176,7 +176,7 @@ static int log_pages_supp(int argc, char **argv, struct command *cmd,
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        err = nvme_get_log(fd, 1, 0xc5, false, sizeof(logPageMap), &logPageMap);
        if (!err) {
                if (strcmp(cfg.output_format,"json")) {
@@ -737,7 +737,7 @@ static int vs_smart_log(int argc, char **argv, struct command *cmd, struct plugi
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        if (strcmp(cfg.output_format,"json"))
                printf("Seagate Extended SMART Information :\n");
 
@@ -835,7 +835,7 @@ static int temp_stats(int argc, char **argv, struct command *cmd, struct plugin
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0) {
                printf ("\nDevice not found \n");;
                return -1;
@@ -1007,7 +1007,7 @@ static int vs_pcie_error_log(int argc, char **argv, struct command *cmd, struct
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        if(strcmp(cfg.output_format,"json"))
                printf("Seagate PCIe error counters Information :\n");
 
@@ -1046,7 +1046,7 @@ static int vs_clr_pcie_correctable_errs(int argc, char **argv, struct command *c
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
 
        err = nvme_set_feature(fd, 0, 0xE1, 0xCB, 0, cfg.save, 0, buf, &result);
 
@@ -1092,7 +1092,7 @@ static int get_host_tele(int argc, char **argv, struct command *cmd, struct plug
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -1192,7 +1192,7 @@ static int get_ctrl_tele(int argc, char **argv, struct command *cmd, struct plug
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -1310,7 +1310,7 @@ static int vs_internal_log(int argc, char **argv, struct command *cmd, struct pl
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 

diff --git a/plugins/shannon/shannon-nvme.c b/plugins/shannon/shannon-nvme.c
index 0798d7b3732639f51ad579229834c9b99b857b67..80db4665effbe9a639f258864468bbd657eada05 100644 (file)
--- a/plugins/shannon/shannon-nvme.c
+++ b/plugins/shannon/shannon-nvme.c
@@ -122,7 +122,7 @@ static int get_additional_smart_log(int argc, char **argv, struct command *cmd,
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        err = nvme_get_log(fd, cfg.namespace_id, 0xca, false,
                   sizeof(smart_log), &smart_log);
        if (!err) {
@@ -190,7 +190,7 @@ static int get_additional_feature(int argc, char **argv, struct command *cmd, st
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -289,7 +289,7 @@ static int set_additional_feature(int argc, char **argv, struct command *cmd, st
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 

diff --git a/plugins/toshiba/toshiba-nvme.c b/plugins/toshiba/toshiba-nvme.c
index 1ef75585d431073708a3c967ce4c48eb2acc03f0..c067ce8e082d84982796b3c46f23c8fd9e82b903 100644 (file)
--- a/plugins/toshiba/toshiba-nvme.c
+++ b/plugins/toshiba/toshiba-nvme.c
@@ -459,7 +459,7 @@ static int vendor_log(int argc, char **argv, struct command *cmd, struct plugin
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0) {
                fprintf(stderr,"%s: failed to parse arguments\n", __func__);
                return EINVAL;
@@ -503,7 +503,7 @@ static int internal_log(int argc, char **argv, struct command *cmd, struct plugi
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0) {
                fprintf(stderr,"%s: failed to parse arguments\n", __func__);
                return EINVAL;
@@ -539,7 +539,7 @@ static int clear_correctable_errors(int argc, char **argv, struct command *cmd,
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, NULL, 0);
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0) {
                fprintf(stderr,"%s: failed to parse arguments\n", __func__);
                return EINVAL;

diff --git a/plugins/virtium/virtium-nvme.c b/plugins/virtium/virtium-nvme.c
index d57c97b6b85c2cb6f46916b6fefc5a58c418ab92..5d5f7bb406eda300c7eefc773f1d95c6b5338828 100644 (file)
--- a/plugins/virtium/virtium-nvme.c
+++ b/plugins/virtium/virtium-nvme.c
@@ -838,7 +838,7 @@ static int vt_save_smart_to_vtview_log(int argc, char **argv, struct command *cm
 
        vt_generate_vtview_log_file_name(vt_default_log_file_name);
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)  {
                printf("Error parse and open (fd = %d)\n", fd);
                return (fd);
@@ -904,7 +904,7 @@ static int vt_show_identify(int argc, char **argv, struct command *cmd, struct p
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, NULL, 0);
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)  {
                printf("Error parse and open (fd = %d)\n", fd);
                return (fd);

diff --git a/plugins/wdc/wdc-nvme.c b/plugins/wdc/wdc-nvme.c
index 8ea0a8f9a9b939b82dfe3a707538fb5b62eafdd1..c0d6c745fc88c4caaf37dc3dd899a4c4f12c475f 100644 (file)
--- a/plugins/wdc/wdc-nvme.c
+++ b/plugins/wdc/wdc-nvme.c
@@ -1624,7 +1624,7 @@ static int wdc_cap_diag(int argc, char **argv, struct command *command,
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, NULL, 0);
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -1923,7 +1923,7 @@ static int wdc_vs_internal_fw_log(int argc, char **argv, struct command *command
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, NULL, 0);
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -2143,7 +2143,7 @@ static int wdc_drive_log(int argc, char **argv, struct command *command,
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, NULL, 0);
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -2188,7 +2188,7 @@ static int wdc_get_crash_dump(int argc, char **argv, struct command *command,
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, NULL, 0);
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -2230,7 +2230,7 @@ static int wdc_get_pfail_dump(int argc, char **argv, struct command *command,
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -2315,7 +2315,7 @@ static int wdc_purge(int argc, char **argv,
        memset(&admin_cmd, 0, sizeof (admin_cmd));
        admin_cmd.opcode = WDC_NVME_PURGE_CMD_OPCODE;
 
-       fd = parse_and_open(argc, argv, desc, opts, NULL, 0);
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -2364,7 +2364,7 @@ static int wdc_purge_monitor(int argc, char **argv,
        admin_cmd.cdw10 = WDC_NVME_PURGE_MONITOR_CMD_CDW10;
        admin_cmd.timeout_ms = WDC_NVME_PURGE_MONITOR_TIMEOUT;
 
-       fd = parse_and_open(argc, argv, desc, opts, NULL, 0);
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -3124,7 +3124,7 @@ static int wdc_vs_smart_add_log(int argc, char **argv, struct command *command,
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, NULL, 0);
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -3170,7 +3170,7 @@ static int wdc_clear_pcie_correctable_errors(int argc, char **argv, struct comma
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, NULL, 0);
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -3214,7 +3214,7 @@ static int wdc_drive_status(int argc, char **argv, struct command *command,
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, NULL, 0);
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -3324,7 +3324,7 @@ static int wdc_clear_assert_dump(int argc, char **argv, struct command *command,
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, NULL, 0);
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -3433,7 +3433,7 @@ static int wdc_vs_fw_activate_history(int argc, char **argv, struct command *com
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, NULL, 0);
+       fd = parse_and_open(argc, argv, desc, opts);
 
        if (fd < 0)
                return fd;
@@ -3465,7 +3465,7 @@ static int wdc_clear_fw_activate_history(int argc, char **argv, struct command *
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, NULL, 0);
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -4210,7 +4210,7 @@ static int wdc_drive_essentials(int argc, char **argv, struct command *command,
        };
 
 
-       fd = parse_and_open(argc, argv, desc, opts, NULL, 0);
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -4266,7 +4266,7 @@ static int wdc_drive_resize(int argc, char **argv,
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, NULL, 0);
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 
@@ -4391,7 +4391,7 @@ static int wdc_vs_nand_stats(int argc, char **argv, struct command *command,
                OPT_END()
        };
 
-       fd = parse_and_open(argc, argv, desc, opts, NULL, 0);
+       fd = parse_and_open(argc, argv, desc, opts);
        if (fd < 0)
                return fd;
 

diff --git a/util/argconfig.c b/util/argconfig.c
index bf3cc3222a8f974b8e694e28b0588bdc00004280..f647448a14617aa3c71faea3bf2b21944af0ad2e 100644 (file)
--- a/util/argconfig.c
+++ b/util/argconfig.c
@@ -138,8 +138,7 @@ void argconfig_print_help(const char *program_desc,
 }
 
 int argconfig_parse(int argc, char *argv[], const char *program_desc,
-                   const struct argconfig_commandline_options *options,
-                   void *config_out, size_t config_size)
+                   const struct argconfig_commandline_options *options)
 {
        char *short_opts;
        char *endptr;

diff --git a/util/argconfig.h b/util/argconfig.h
index 5c60e45399ca6d7edb9e791035b2df025a87b813..623b8323c2ea273e816632ab9c8ba1bedc45ff9e 100644 (file)
--- a/util/argconfig.h
+++ b/util/argconfig.h
@@ -116,8 +116,7 @@ void argconfig_append_usage(const char *str);
 void argconfig_print_help(const char *program_desc,
                          const struct argconfig_commandline_options *options);
 int argconfig_parse(int argc, char *argv[], const char *program_desc,
-                   const struct argconfig_commandline_options *options,
-                   void *config_out, size_t config_size);
+                   const struct argconfig_commandline_options *options);
 int argconfig_parse_subopt_string(char *string, char **options,
                                  size_t max_options);
 unsigned argconfig_parse_comma_sep_array(char *string, int *ret,