From 5d0380bff953de6972491b18e1e02b8f246e691c Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Tue, 29 Mar 2022 12:02:43 +0200 Subject: [PATCH] argconfig: Rename CFG_NONE to CFG_FLAG CFG_NONE is used to for OPT_FLAG. All other OPT_ macros have the matching CFG_ enum. Let's rename CFG_NONE to CFG_FLAG to match and make it consistent. Signed-off-by: Daniel Wagner --- plugins/intel/intel-nvme.c | 4 ++-- plugins/memblaze/memblaze-nvme.c | 4 ++-- util/argconfig.c | 2 +- util/argconfig.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/intel/intel-nvme.c b/plugins/intel/intel-nvme.c index d80b18cb..3a73ff93 100644 --- a/plugins/intel/intel-nvme.c +++ b/plugins/intel/intel-nvme.c @@ -1537,8 +1537,8 @@ static int enable_lat_stats_tracking(int argc, char **argv, }; const struct argconfig_commandline_options command_line_options[] = { - {"enable", 'e', "", CFG_NONE, &cfg.enable, no_argument, enable_desc}, - {"disable", 'd', "", CFG_NONE, &cfg.disable, no_argument, disable_desc}, + {"enable", 'e', "", CFG_FLAG, &cfg.enable, no_argument, enable_desc}, + {"disable", 'd', "", CFG_FLAG, &cfg.disable, no_argument, disable_desc}, {NULL} }; diff --git a/plugins/memblaze/memblaze-nvme.c b/plugins/memblaze/memblaze-nvme.c index 9096a479..c0f4d663 100644 --- a/plugins/memblaze/memblaze-nvme.c +++ b/plugins/memblaze/memblaze-nvme.c @@ -1148,8 +1148,8 @@ static int mb_set_lat_stats(int argc, char **argv, }; const struct argconfig_commandline_options command_line_options[] = { - {"enable", 'e', "", CFG_NONE, &cfg.enable, no_argument, enable_desc}, - {"disable", 'd', "", CFG_NONE, &cfg.disable, no_argument, disable_desc}, + {"enable", 'e', "", CFG_FLAG, &cfg.enable, no_argument, enable_desc}, + {"disable", 'd', "", CFG_FLAG, &cfg.disable, no_argument, disable_desc}, {NULL} }; diff --git a/util/argconfig.c b/util/argconfig.c index 85826590..59d8f1d9 100644 --- a/util/argconfig.c +++ b/util/argconfig.c @@ -351,7 +351,7 @@ int argconfig_parse(int argc, char *argv[], const char *program_desc, goto out; } *((FILE **) value_addr) = f; - } else if (s->config_type == CFG_NONE) { + } else if (s->config_type == CFG_FLAG) { *((bool *)value_addr) = true; } } diff --git a/util/argconfig.h b/util/argconfig.h index 3b6da4cd..a11334bb 100644 --- a/util/argconfig.h +++ b/util/argconfig.h @@ -38,7 +38,7 @@ #include enum argconfig_types { - CFG_NONE, + CFG_FLAG, CFG_STRING, CFG_INT, CFG_SIZE, @@ -65,7 +65,7 @@ enum argconfig_types { #define OPT_END() { NULL } #define OPT_FLAG(l, s, v, d) \ - {l, s, NULL, CFG_NONE, v, no_argument, d} + {l, s, NULL, CFG_FLAG, v, no_argument, d} #define OPT_SUFFIX(l, s, v, d) \ {l, s, "IONUM", CFG_LONG_SUFFIX, v, required_argument, d} -- 2.50.1