Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Stefano Sabatini <stefasab@gmail.com>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Subject: Re: [FFmpeg-devel] [PATCH] fftools/ffprobe: Use proper enum type
Date: Tue, 8 Aug 2023 09:14:18 +0200
Message-ID: <20230808071418.GA4305@mariano> (raw)
In-Reply-To: <AS8P250MB07444645DB3290137F52C1E08F0FA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>

On date Sunday 2023-08-06 15:28:00 +0200, Andreas Rheinhardt wrote:
> This is a bit cleaner as int need not be the underlying type
> of an enum if a smaller type can hold all its values.
> Also declare the children_ids array as const as it never changes.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  fftools/ffprobe.c | 38 ++++++++++++++++++--------------------
>  1 file changed, 18 insertions(+), 20 deletions(-)
> 
> diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
> index 5c2d4cbff1..4fcfe1164b 100644
> --- a/fftools/ffprobe.c
> +++ b/fftools/ffprobe.c
> @@ -161,22 +161,6 @@ static int find_stream_info  = 1;
>  
>  #define SECTION_MAX_NB_CHILDREN 10
>  
> -struct section {
> -    int id;             ///< unique id identifying a section
> -    const char *name;
> -
> -#define SECTION_FLAG_IS_WRAPPER      1 ///< the section only contains other sections, but has no data at its own level
> -#define SECTION_FLAG_IS_ARRAY        2 ///< the section contains an array of elements of the same type
> -#define SECTION_FLAG_HAS_VARIABLE_FIELDS 4 ///< the section may contain a variable number of fields with variable keys.
> -                                           ///  For these sections the element_name field is mandatory.
> -    int flags;
> -    int children_ids[SECTION_MAX_NB_CHILDREN+1]; ///< list of children section IDS, terminated by -1
> -    const char *element_name; ///< name of the contained element, if provided
> -    const char *unique_name;  ///< unique section name, in case the name is ambiguous
> -    AVDictionary *entries_to_show;
> -    int show_all_entries;
> -};
> -
>  typedef enum {
>      SECTION_ID_NONE = -1,
>      SECTION_ID_CHAPTER,
> @@ -229,6 +213,22 @@ typedef enum {
>      SECTION_ID_SUBTITLE,
>  } SectionID;
>  
> +struct section {
> +    int id;             ///< unique id identifying a section
> +    const char *name;
> +
> +#define SECTION_FLAG_IS_WRAPPER      1 ///< the section only contains other sections, but has no data at its own level
> +#define SECTION_FLAG_IS_ARRAY        2 ///< the section contains an array of elements of the same type
> +#define SECTION_FLAG_HAS_VARIABLE_FIELDS 4 ///< the section may contain a variable number of fields with variable keys.
> +                                           ///  For these sections the element_name field is mandatory.
> +    int flags;
> +    const SectionID children_ids[SECTION_MAX_NB_CHILDREN+1]; ///< list of children section IDS, terminated by -1
> +    const char *element_name; ///< name of the contained element, if provided
> +    const char *unique_name;  ///< unique section name, in case the name is ambiguous
> +    AVDictionary *entries_to_show;
> +    int show_all_entries;
> +};
> +
>  static struct section sections[] = {
>      [SECTION_ID_CHAPTERS] =           { SECTION_ID_CHAPTERS, "chapters", SECTION_FLAG_IS_ARRAY, { SECTION_ID_CHAPTER, -1 } },
>      [SECTION_ID_CHAPTER] =            { SECTION_ID_CHAPTER, "chapter", 0, { SECTION_ID_CHAPTER_TAGS, -1 } },
> @@ -3688,8 +3688,7 @@ static inline void mark_section_show_entries(SectionID section_id,
>  
>      section->show_all_entries = show_all_entries;
>      if (show_all_entries) {
> -        SectionID *id;
> -        for (id = section->children_ids; *id != -1; id++)
> +        for (const SectionID *id = section->children_ids; *id != -1; id++)
>              mark_section_show_entries(*id, show_all_entries, entries);
>      } else {
>          av_dict_copy(&section->entries_to_show, entries, 0);
> @@ -4072,11 +4071,10 @@ static const OptionDef real_options[] = {
>  

>  static inline int check_section_show_entries(int section_id)
>  {
> -    int *id;
>      struct section *section = &sections[section_id];
>      if (sections[section_id].show_all_entries || sections[section_id].entries_to_show)
>          return 1;

> -    for (id = section->children_ids; *id != -1; id++)
> +    for (const SectionID *id = section->children_ids; *id != -1; id++)

I remember this might trigger a C90 style warning (mixed declarations
and statements), make sure it's not the case anymore.

>          if (check_section_show_entries(*id))
>              return 1;
>      return 0;
> -- 
> 2.34.1

LGTM, thanks.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

  reply	other threads:[~2023-08-08  7:14 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-06 13:28 Andreas Rheinhardt
2023-08-08  7:14 ` Stefano Sabatini [this message]
2023-08-08 11:13   ` Andreas Rheinhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230808071418.GA4305@mariano \
    --to=stefasab@gmail.com \
    --cc=andreas.rheinhardt@outlook.com \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git