diff mbox series

parseopt: move definition of enum parse_opt_result up

Message ID 58e5dd7b-d577-a1d9-c704-44642f553323@web.de (mailing list archive)
State New, archived
Headers show
Series parseopt: move definition of enum parse_opt_result up | expand

Commit Message

René Scharfe Aug. 20, 2019, 6:49 p.m. UTC
Define enum parse_opt_result before using it in a typedef.  This avoids
the following compiler warning:

   ./parse-options.h:53:14: error: ISO C forbids forward references to 'enum' types [-Werror,-Wpedantic]
   typedef enum parse_opt_result parse_opt_ll_cb(struct parse_opt_ctx_t *ctx,
                ^

While GCC and Clang both accept such a forward reference by default,
other compilers might be less forgiving.

Signed-off-by: René Scharfe <l.s.r@web.de>
---
 parse-options.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

--
2.23.0

Comments

Johannes Schindelin Aug. 22, 2019, 2:47 p.m. UTC | #1
Hi,

On Tue, 20 Aug 2019, René Scharfe wrote:

> Define enum parse_opt_result before using it in a typedef.  This avoids
> the following compiler warning:
>
>    ./parse-options.h:53:14: error: ISO C forbids forward references to 'enum' types [-Werror,-Wpedantic]
>    typedef enum parse_opt_result parse_opt_ll_cb(struct parse_opt_ctx_t *ctx,
>                 ^
>
> While GCC and Clang both accept such a forward reference by default,
> other compilers might be less forgiving.

Looks obviously correct to me.

Thanks,
Dscho

>
> Signed-off-by: René Scharfe <l.s.r@web.de>
> ---
>  parse-options.h | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/parse-options.h b/parse-options.h
> index a4bd40bb6a..38a33a087e 100644
> --- a/parse-options.h
> +++ b/parse-options.h
> @@ -46,6 +46,15 @@ enum parse_opt_option_flags {
>  	PARSE_OPT_COMP_ARG = 1024
>  };
>
> +enum parse_opt_result {
> +	PARSE_OPT_COMPLETE = -3,
> +	PARSE_OPT_HELP = -2,
> +	PARSE_OPT_ERROR = -1,	/* must be the same as error() */
> +	PARSE_OPT_DONE = 0,	/* fixed so that "return 0" works */
> +	PARSE_OPT_NON_OPTION,
> +	PARSE_OPT_UNKNOWN
> +};
> +
>  struct option;
>  typedef int parse_opt_cb(const struct option *, const char *arg, int unset);
>
> @@ -241,15 +250,6 @@ const char *optname(const struct option *opt, int flags);
>
>  /*----- incremental advanced APIs -----*/
>
> -enum parse_opt_result {
> -	PARSE_OPT_COMPLETE = -3,
> -	PARSE_OPT_HELP = -2,
> -	PARSE_OPT_ERROR = -1,	/* must be the same as error() */
> -	PARSE_OPT_DONE = 0,	/* fixed so that "return 0" works */
> -	PARSE_OPT_NON_OPTION,
> -	PARSE_OPT_UNKNOWN
> -};
> -
>  /*
>   * It's okay for the caller to consume argv/argc in the usual way.
>   * Other fields of that structure are private to parse-options and should not
> --
> 2.23.0
>
diff mbox series

Patch

diff --git a/parse-options.h b/parse-options.h
index a4bd40bb6a..38a33a087e 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -46,6 +46,15 @@  enum parse_opt_option_flags {
 	PARSE_OPT_COMP_ARG = 1024
 };

+enum parse_opt_result {
+	PARSE_OPT_COMPLETE = -3,
+	PARSE_OPT_HELP = -2,
+	PARSE_OPT_ERROR = -1,	/* must be the same as error() */
+	PARSE_OPT_DONE = 0,	/* fixed so that "return 0" works */
+	PARSE_OPT_NON_OPTION,
+	PARSE_OPT_UNKNOWN
+};
+
 struct option;
 typedef int parse_opt_cb(const struct option *, const char *arg, int unset);

@@ -241,15 +250,6 @@  const char *optname(const struct option *opt, int flags);

 /*----- incremental advanced APIs -----*/

-enum parse_opt_result {
-	PARSE_OPT_COMPLETE = -3,
-	PARSE_OPT_HELP = -2,
-	PARSE_OPT_ERROR = -1,	/* must be the same as error() */
-	PARSE_OPT_DONE = 0,	/* fixed so that "return 0" works */
-	PARSE_OPT_NON_OPTION,
-	PARSE_OPT_UNKNOWN
-};
-
 /*
  * It's okay for the caller to consume argv/argc in the usual way.
  * Other fields of that structure are private to parse-options and should not