[FFmpeg-devel] [PATCH v5 8/8] fftools/ffprobe: Rename AVTextFormatContext variables (w => tc)

[Stefano Sabatini]

Typo in the subject line (should be "tfc").

On date Saturday 2025-03-08 17:55:35 +0000, softworkz wrote:
> From: softworkz <softworkz at hotmail.com>
> 
> Signed-off-by: softworkz <softworkz at hotmail.com>
> ---
>  fftools/ffprobe.c | 534 +++++++++++++++++++++++-----------------------
>  1 file changed, 267 insertions(+), 267 deletions(-)
> 
>  static int opt_show_optional_fields(void *optctx, const char *opt, const char *arg)
> @@ -3052,7 +3052,7 @@ static inline int check_section_show_entries(int section_id)
>  int main(int argc, char **argv)
>  {
>      const AVTextFormatter *f;
> -    AVTextFormatContext *tctx;
> +    AVTextFormatContext *tfc;

I'd drop this rename since it introduces a greater asymmetry.

>      AVTextWriterContext *wctx;
>      char *buf;
>      char *f_name = NULL, *f_args = NULL;
> @@ -3147,21 +3147,21 @@ int main(int argc, char **argv)
>      if (ret < 0)
>          goto end;
>  
> -    if ((ret = avtext_context_open(&tctx, f, wctx, f_args,
> +    if ((ret = avtext_context_open(&tfc, f, wctx, f_args,
>                             sections, FF_ARRAY_ELEMS(sections), show_value_unit,
>                              use_value_prefix, use_byte_value_binary_prefix, use_value_sexagesimal_format,
>                              show_optional_fields, show_data_hash)) >= 0) {
>          if (f == &avtextformatter_xml)
> -            tctx->string_validation_utf8_flags |= AV_UTF8_FLAG_EXCLUDE_XML_INVALID_CONTROL_CODES;
> +            tfc->string_validation_utf8_flags |= AV_UTF8_FLAG_EXCLUDE_XML_INVALID_CONTROL_CODES;
>  
> -        avtext_print_section_header(tctx, NULL, SECTION_ID_ROOT);
> +        avtext_print_section_header(tfc, NULL, SECTION_ID_ROOT);
>  
>          if (do_show_program_version)
> -            ffprobe_show_program_version(tctx);
> +            ffprobe_show_program_version(tfc);
>          if (do_show_library_versions)
> -            ffprobe_show_library_versions(tctx);
> +            ffprobe_show_library_versions(tfc);
>          if (do_show_pixel_formats)
> -            ffprobe_show_pixel_formats(tctx);
> +            ffprobe_show_pixel_formats(tfc);
>  
>          if (!input_filename &&
>              ((do_show_format || do_show_programs || do_show_stream_groups || do_show_streams || do_show_chapters || do_show_packets || do_show_error) ||
> @@ -3171,20 +3171,20 @@ int main(int argc, char **argv)
>              av_log(NULL, AV_LOG_ERROR, "Use -h to get full help or, even better, run 'man %s'.\n", program_name);
>              ret = AVERROR(EINVAL);
>          } else if (input_filename) {
> -            ret = probe_file(tctx, input_filename, print_input_filename);
> +            ret = probe_file(tfc, input_filename, print_input_filename);
>              if (ret < 0 && do_show_error)
> -                show_error(tctx, ret);
> +                show_error(tfc, ret);
>          }
>  
>          input_ret = ret;
>  
> -        avtext_print_section_footer(tctx);
> +        avtext_print_section_footer(tfc);
>  
>          ret = avtextwriter_context_close(&wctx);
>          if (ret < 0)
>              av_log(NULL, AV_LOG_ERROR, "Writing output failed (closing writer): %s\n", av_err2str(ret));
>  
> -        ret = avtext_context_close(&tctx);
> +        ret = avtext_context_close(&tfc);
>          if (ret < 0)
>              av_log(NULL, AV_LOG_ERROR, "Writing output failed (closing formatter): %s\n", av_err2str(ret));

Should be good otherwise, thanks.