github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

casadm: set log level when printing cmd's usage

Browse Source 
Allow printing command's usage with the same log level as it's context

Signed-off-by: Michal Mielewczyk <michal.mielewczyk@intel.com>
This commit is contained in:
Michal Mielewczyk 2022-03-02 09:39:46 +01:00
parent 6f26d2eade
commit 04c2d97ea2
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
casadm/argp.c
View File

@ -64,8 +64,9 @@ char *command_name_in_brackets(char *buf, size_t buf_size, char short_name, char
return buf; return buf;
} }
void print_options_usage(cli_option* options, const char *separator, void print_options_usage(int log_level, cli_option* options,
int (*view)(cli_option* options, int flag), int flag) const char *separator, int (*view)(cli_option* options, int flag),
int flag)
{ {
int print_separator = 0; int print_separator = 0;
int i; int i;
@ -81,16 +82,16 @@ void print_options_usage(cli_option* options, const char *separator,
if (print_separator) { if (print_separator) {
/* Separator */ /* Separator */
cas_printf(LOG_INFO, "%s", separator); cas_printf(log_level, "%s", separator);
} }
print_separator = 1; print_separator = 1;
/* Long option name */ /* Long option name */
cas_printf(LOG_INFO, "--%s", options[i].long_name); cas_printf(log_level, "--%s", options[i].long_name);
/* Parameter */ /* Parameter */
if (options[i].arg != NULL) { if (options[i].arg != NULL) {
cas_printf(LOG_INFO, " <%s>", cas_printf(log_level, " <%s>",
options[i].arg); options[i].arg);
} }
} }

5
casadm/argp.h
View File

@ -119,8 +119,9 @@ char *command_name_in_brackets(char *buf, size_t buf_size, char short_name, char
void print_help(const app *app_values, const cli_command *commands); void print_help(const app *app_values, const cli_command *commands);
void print_options_usage(cli_option* options, const char *separator, void print_options_usage(int log_level, cli_option* options,
int (*view)(cli_option* options, int flag), int flag); const char *separator, int (*view)(cli_option* options, int flag),
int flag);
void print_list_options(cli_option* options, int flag, void print_list_options(cli_option* options, int flag,
int (*view)(cli_option* options, int flag)); int (*view)(cli_option* options, int flag));

6
casadm/cas_main.c
View File

@ -170,7 +170,7 @@ static inline void cmd_subcmd_print_invalid_subcmd(cli_option* options)
{ {
cas_printf(LOG_ERR, "Invalid or missing first sub-command parameter. "); cas_printf(LOG_ERR, "Invalid or missing first sub-command parameter. ");
cas_printf(LOG_ERR, "Expected one of the: {"); cas_printf(LOG_ERR, "Expected one of the: {");
print_options_usage(options, "|", cmd_subcmd_print_subcmd, 0); print_options_usage(LOG_ERR, options, "|", cmd_subcmd_print_subcmd, 0);
cas_printf(LOG_ERR, "}\n"); cas_printf(LOG_ERR, "}\n");
} }
@ -183,7 +183,7 @@ void cmd_subcmd_help(app *app_values, cli_command *cmd, int flag_required)
/* Print usage */ /* Print usage */
cas_printf(LOG_INFO, "Usage: %s --%s {", app_values->name, cmd->name); cas_printf(LOG_INFO, "Usage: %s --%s {", app_values->name, cmd->name);
print_options_usage(cmd->options, "|", cmd_subcmd_print_subcmd, 0); print_options_usage(LOG_INFO, cmd->options, "|", cmd_subcmd_print_subcmd, 0);
cas_printf(LOG_INFO, "}\n\n"); cas_printf(LOG_INFO, "}\n\n");
print_command_header(app_values, cmd); print_command_header(app_values, cmd);
@ -217,7 +217,7 @@ void cmd_subcmd_help(app *app_values, cli_command *cmd, int flag_required)
} }
} }
print_options_usage(cmd->options, " ", cmd_subcmd_print_param, print_options_usage(LOG_INFO, cmd->options, " ", cmd_subcmd_print_param,
(1 << flag) | (1 << flag_required)); (1 << flag) | (1 << flag_required));
if (all_ops != printed_ops) { if (all_ops != printed_ops) {