[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/5] getargs: rename argument to avoid gnulib's renaming
From: |
Akim Demaille |
Subject: |
[PATCH 1/5] getargs: rename argument to avoid gnulib's renaming |
Date: |
Tue, 8 May 2018 17:02:28 +0200 |
With Clang 6.0:
CC src/bison-getargs.o
bison/src/getargs.c:67:12: error: parameter 'option' not found in the
function declaration [-Werror,-Wdocumentation]
* \param option option being decoded.
^~~~~~
bison/src/getargs.c:67:12: note: did you mean 'rpl_option'?
* src/getargs.c: Don't use `option` as a documentation argument.
---
src/getargs.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/getargs.c b/src/getargs.c
index fa9e3c1c..b85d5b11 100644
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -64,7 +64,7 @@ struct bison_language const *language = &valid_languages[0];
/** Decode an option's key.
*
- * \param option option being decoded.
+ * \param opt option being decoded.
* \param keys array of valid subarguments.
* \param values array of corresponding (int) values.
* \param all the all value.
@@ -79,11 +79,11 @@ struct bison_language const *language = &valid_languages[0];
* flags from \c all. Thus no-none = all and no-all = none.
*/
static void
-flag_argmatch (const char *option,
- const char * const keys[], const int values[],
+flag_argmatch (const char *opt,
+ const char *const keys[], const int values[],
int all, int *flags, char *arg, size_t no)
{
- int value = XARGMATCH (option, arg + no, keys, values);
+ int value = XARGMATCH (opt, arg + no, keys, values);
/* -rnone == -rno-all, and -rno-none == -rall. */
if (!value)
@@ -100,7 +100,7 @@ flag_argmatch (const char *option,
/** Decode an option's set of keys.
*
- * \param option option being decoded.
+ * \param opt option being decoded (e.g., --report).
* \param keys array of valid subarguments.
* \param values array of corresponding (int) values.
* \param all the all value.
@@ -109,7 +109,7 @@ flag_argmatch (const char *option,
* If 0, then activate all the flags.
*/
static void
-flags_argmatch (const char *option,
+flags_argmatch (const char *opt,
const char * const keys[], const int values[],
int all, int *flags, char *args)
{
@@ -117,7 +117,7 @@ flags_argmatch (const char *option,
for (args = strtok (args, ","); args; args = strtok (NULL, ","))
{
size_t no = STRPREFIX_LIT ("no-", args) ? 3 : 0;
- flag_argmatch (option, keys,
+ flag_argmatch (opt, keys,
values, all, flags, args, no);
}
else
--
2.17.0
- [PATCH 0/5] Update gnulib, and minor changes, Akim Demaille, 2018/05/08
- [PATCH 2/5] tests: we might need to find gnulib headers, Akim Demaille, 2018/05/08
- [PATCH 3/5] gnulib: update, Akim Demaille, 2018/05/08
- [PATCH 4/5] doc: wrap, Akim Demaille, 2018/05/08
- [PATCH 1/5] getargs: rename argument to avoid gnulib's renaming,
Akim Demaille <=
- [PATCH 5/5] style: don't use std::endl, Akim Demaille, 2018/05/08
- Re: [PATCH 5/5] style: don't use std::endl, Hans Åberg, 2018/05/08
- Re: [PATCH 5/5] style: don't use std::endl, Akim Demaille, 2018/05/09
- Re: [PATCH 5/5] style: don't use std::endl, Hans Åberg, 2018/05/09
- Re: [PATCH 5/5] style: don't use std::endl, Hans Åberg, 2018/05/10
- Re: [PATCH 5/5] style: don't use std::endl, Akim Demaille, 2018/05/10
- Re: [PATCH 5/5] style: don't use std::endl, Hans Åberg, 2018/05/10
Re: [PATCH 0/5] Update gnulib, and minor changes, Akim Demaille, 2018/05/09