From 42f6dbda0975bccc5344621215c183b45277480b Mon Sep 17 00:00:00 2001
From: Gaetan Rivet <gaetan.rivet@6wind.com>
Date: Thu, 20 Dec 2018 18:06:43 +0100
Subject: [PATCH] eal: rename option name field
option->opt_* is redundant.
The field should also be constant.
Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
---
lib/librte_eal/common/include/rte_option.h | 2 +-
lib/librte_eal/common/rte_option.c | 8 ++++----
lib/librte_telemetry/rte_telemetry.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/librte_eal/common/include/rte_option.h b/lib/librte_eal/common/include/rte_option.h
index bbcc6cec9e..eea95e477b 100644
--- a/lib/librte_eal/common/include/rte_option.h
+++ b/lib/librte_eal/common/include/rte_option.h
@@ -34,7 +34,7 @@ typedef int (*rte_option_cb)(void);
*/
struct rte_option {
TAILQ_ENTRY(rte_option) next; /**< Next entry in the list. */
- char *opt_str; /**< The option name. */
+ const char *name; /**< The option name. */
const char *usage; /**< Option summary string. */
rte_option_cb cb; /**< Function called when option is used. */
int enabled; /**< Set when the option is used. */
diff --git a/lib/librte_eal/common/rte_option.c b/lib/librte_eal/common/rte_option.c
index 2ed74873b4..d94363872c 100644
--- a/lib/librte_eal/common/rte_option.c
+++ b/lib/librte_eal/common/rte_option.c
@@ -26,7 +26,7 @@ rte_option_parse(const char *opt)
/* Check if the option is registered */
TAILQ_FOREACH(option, &rte_option_list, next) {
- if (strcmp(&opt[2], option->opt_str) == 0) {
+ if (strcmp(&opt[2], option->name) == 0) {
option->enabled = 1;
return 0;
}
@@ -41,9 +41,9 @@ rte_option_register(struct rte_option *opt)
struct rte_option *option;
TAILQ_FOREACH(option, &rte_option_list, next) {
- if (strcmp(opt->opt_str, option->opt_str) == 0) {
+ if (strcmp(opt->name, option->name) == 0) {
RTE_LOG(INFO, EAL, "Option %s has already been registered.\n",
- opt->opt_str);
+ opt->name);
return;
}
}
@@ -75,6 +75,6 @@ rte_option_usage(void)
printf("EAL dynamic options:\n");
TAILQ_FOREACH(option, &rte_option_list, next)
- printf(" --%-*s %s\n", 17, option->opt_str, option->usage);
+ printf(" --%-*s %s\n", 17, option->name, option->usage);
printf("\n");
}
diff --git a/lib/librte_telemetry/rte_telemetry.c b/lib/librte_telemetry/rte_telemetry.c
index 2e808cd7aa..b852630c51 100644
--- a/lib/librte_telemetry/rte_telemetry.c
+++ b/lib/librte_telemetry/rte_telemetry.c
@@ -1820,7 +1820,7 @@ rte_telemetry_json_socket_message_test(struct telemetry_impl *telemetry, int fd)
int telemetry_log_level;
static struct rte_option option = {
- .opt_str = "telemetry",
+ .name = "telemetry",
.usage = "Enable telemetry backend",
.cb = &rte_telemetry_init,
.enabled = 0