From f6652e7404ba4f10923227c75da4db4c86b1275e Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Wed, 17 May 2017 14:24:21 +0100 Subject: commands: allow _aliases[] to be const Commands with aliases define an array of alias strings such as: static const char *_aliases[] = { "", NULL}; Although the elements are of type `const char *`, the elements themselves are not `const`-qualified. If the array is declared as: static const char * const _aliases[] = { "", NULL}; then the compiler warns about const qualifiers being discarded. This is because the `aliases` member of `struct command` is declared as `const char *aliases;`. Change the declaration of the `aliases` member of `struct command` to `const char * const *aliases;` so that it can point to a `const` array of `const char *`. Also change the declaration of the `aliases` variable in `register_command()` to avoid unnecessary type casts. Signed-off-by: Ian Abbott Signed-off-by: Sascha Hauer --- common/command.c | 2 +- include/command.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/command.c b/common/command.c index 03c70834d1..d9cc4a6d48 100644 --- a/common/command.c +++ b/common/command.c @@ -104,7 +104,7 @@ int register_command(struct command *cmd) list_add_sort(&cmd->list, &command_list, compare); if (cmd->aliases) { - char **aliases = (char**)cmd->aliases; + const char * const *aliases = cmd->aliases; while(*aliases) { struct command *c = xzalloc(sizeof(struct command)); diff --git a/include/command.h b/include/command.h index 43ee454f22..0afc5c7550 100644 --- a/include/command.h +++ b/include/command.h @@ -40,7 +40,7 @@ struct string_list; */ struct command { const char *name; /* Command Name */ - const char **aliases; + const char * const *aliases; /* Implementation function */ int (*cmd)(int, char *[]); int (*complete)(struct string_list *sl, char *instr); -- cgit v1.2.3