cleanup: do not store _VAL name string

String enum_name[] is unused so remove is with
all generated strings.

Reoder struct members, so there are no holes.

diff --git a/tools/command.c b/tools/command.c
index 5b1817bdc9ffb30bb80c679b82f786726d68a830..55a774698c6a2ea5176a7edcea0e03c7abf13f81 100644 (file)
--- a/tools/command.c
+++ b/tools/command.c
@@ -39,7 +39,7 @@ struct cmd_name {
 /* create table of value names, e.g. String, and corresponding enum from vals.h */
 
 static const struct val_name val_names[VAL_COUNT + 1] = {
-#define val(a, b, c, d) { # a, a, b, c, d },
+#define val(a, b, c, d) { b, d, c, a },
 #include "vals.h"
 #undef val
 };

diff --git a/tools/command.h b/tools/command.h
index a9ce476855bbb50b0ccf37b5ddfb71d2846d714c..4d3ab827406ecd0a484b2f6fe2385d3a049fb02e 100644 (file)
--- a/tools/command.h
+++ b/tools/command.h
@@ -239,11 +239,10 @@ struct opt_name {
 /* see global val_names[] */
 
 struct val_name {
-       const char enum_name[30]; /* "foo_VAL" */
-       uint16_t val_enum;      /* foo_VAL */
        int (*fn) (struct cmd_context *cmd, struct arg_values *av); /* foo_arg() */
-       const char name[32];    /* FooVal */
        const char *usage;
+       const char name[30];    /* FooVal */
+       uint16_t val_enum;      /* foo_VAL */
 };
 
 /* see global lv_props[] */