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 <dwagner@suse.de>

diff --git a/plugins/intel/intel-nvme.c b/plugins/intel/intel-nvme.c
index d80b18cb3f99e9e31056748470230275dac133f8..3a73ff93248a157f414235d264f7506ecdd6a017 100644 (file)
--- 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 9096a4790590d5a57607ced5e3ab3a1cf7702868..c0f4d66375b0dff75cc557d088d10d828a8ab588 100644 (file)
--- 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 85826590452a9518bf79956e562c0d1288818a1b..59d8f1d9a4de9c57302a9a89605811a5080eb278 100644 (file)
--- 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 3b6da4cd4ff5996a22bbd93c32bbadca3c148cf9..a11334bb855b54326fc49fd6ec986ec53e6fb86b 100644 (file)
--- a/util/argconfig.h
+++ b/util/argconfig.h
@@ -38,7 +38,7 @@
 #include <stdarg.h>
 
 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}