From a773384ccc787d9bb4345cd59ad2f5a2021b7620 Mon Sep 17 00:00:00 2001 From: Renato Botelho do Couto Date: Fri, 7 Jul 2023 11:29:25 +0000 Subject: [PATCH] cli_show_option_bool: Rename bool -> result bool will conflict with boolean type if stdbool.h is included. No functional changes intended. --- apps/cli/cli_show.c | 14 +++++++------- apps/cli/clixon_cli_api.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/cli/cli_show.c b/apps/cli/cli_show.c index 902f8e16..733af0b3 100644 --- a/apps/cli/cli_show.c +++ b/apps/cli/cli_show.c @@ -589,16 +589,16 @@ cli_show_option_format(cvec *argv, /*! Common internal parse cli show boolean option * - * @param[in] argv String vector: [] - * @param[in] argc Index into argv - * @param[out] bool result boolean: 0 or 1 - * @retval 0 OK - * @retval -1 Error + * @param[in] argv String vector: [] + * @param[in] argc Index into argv + * @param[out] result result boolean: 0 or 1 + * @retval 0 OK + * @retval -1 Error */ int cli_show_option_bool(cvec *argv, int argc, - int *bool + int *result ) { int retval = -1; @@ -614,7 +614,7 @@ cli_show_option_bool(cvec *argv, clicon_err(OE_UNIX, errno, "Parse boolean %s", boolstr); goto done; } - *bool = cv_bool_get(boolcv); + *result = cv_bool_get(boolcv); retval = 0; done: if (boolcv) diff --git a/apps/cli/clixon_cli_api.h b/apps/cli/clixon_cli_api.h index c7ff5e0e..5db08135 100644 --- a/apps/cli/clixon_cli_api.h +++ b/apps/cli/clixon_cli_api.h @@ -124,7 +124,7 @@ int cli_show_common(clicon_handle h, char *db, enum format_enum format, int pret int show_yang(clicon_handle h, cvec *vars, cvec *argv); int show_conf_xpath(clicon_handle h, cvec *cvv, cvec *argv); int cli_show_option_format(cvec *argv, int argc, enum format_enum *format); -int cli_show_option_bool(cvec *argv, int argc, int *bool); +int cli_show_option_bool(cvec *argv, int argc, int *result); int cli_show_option_withdefault(cvec *argv, int argc, char **withdefault, char **extdefault); int cli_show_config(clicon_handle h, cvec *cvv, cvec *argv);