From 0615355ffae4e3ef53cd27703061e9e87cd2f640 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 12 Jan 2017 16:18:27 +0000 Subject: [PATCH] kvargs: make pointers in string arrays const Change the parameters of functions from const char *valid[] to const char * const valid[]. This additional const is needed to allow us to fix some checkpatch warnings, as well as being good programming practice. For the checkpatch warnings, if we have a set of command line args that we want to check defined as: static const char *args[] = { "arg1", "arg2", NULL }; kvlist = rte_kvargs_parse(params, args); checkpatch will complain: WARNING:STATIC_CONST_CHAR_ARRAY: static const char * array should probably be static const char * const Adding the additional const to the definition of the args will then trigger a compiler error in the absence of this change to the kvargs library, as we lose the const in the call to kvargs_parse. Signed-off-by: Bruce Richardson Acked-by: Olivier Matz --- lib/librte_kvargs/rte_kvargs.c | 8 ++++---- lib/librte_kvargs/rte_kvargs.h | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/librte_kvargs/rte_kvargs.c b/lib/librte_kvargs/rte_kvargs.c index 8d56abd4c8..854ac83f51 100644 --- a/lib/librte_kvargs/rte_kvargs.c +++ b/lib/librte_kvargs/rte_kvargs.c @@ -92,9 +92,9 @@ rte_kvargs_tokenize(struct rte_kvargs *kvlist, const char *params) * into a list of valid keys. */ static int -is_valid_key(const char *valid[], const char *key_match) +is_valid_key(const char * const valid[], const char *key_match) { - const char **valid_ptr; + const char * const *valid_ptr; for (valid_ptr = valid; *valid_ptr != NULL; valid_ptr++) { if (strcmp(key_match, *valid_ptr) == 0) @@ -109,7 +109,7 @@ is_valid_key(const char *valid[], const char *key_match) */ static int check_for_valid_keys(struct rte_kvargs *kvlist, - const char *valid[]) + const char * const valid[]) { unsigned i, ret; struct rte_kvargs_pair *pair; @@ -187,7 +187,7 @@ rte_kvargs_free(struct rte_kvargs *kvlist) * check if only valid keys were used. */ struct rte_kvargs * -rte_kvargs_parse(const char *args, const char *valid_keys[]) +rte_kvargs_parse(const char *args, const char * const valid_keys[]) { struct rte_kvargs *kvlist; diff --git a/lib/librte_kvargs/rte_kvargs.h b/lib/librte_kvargs/rte_kvargs.h index ae9ae79f21..5821c726ae 100644 --- a/lib/librte_kvargs/rte_kvargs.h +++ b/lib/librte_kvargs/rte_kvargs.h @@ -97,7 +97,8 @@ struct rte_kvargs { * - A pointer to an allocated rte_kvargs structure on success * - NULL on error */ -struct rte_kvargs *rte_kvargs_parse(const char *args, const char *valid_keys[]); +struct rte_kvargs *rte_kvargs_parse(const char *args, + const char *const valid_keys[]); /** * Free a rte_kvargs structure -- 2.20.1