[FFmpeg-devel] [PATCH v3 3/7] fftools/ffprobe: Rename writer_print_section_* and WriterContext

[Soft Works]

> -----Original Message-----
> From: Stefano Sabatini <stefasab at gmail.com>
> Sent: Samstag, 8. März 2025 15:46
> To: FFmpeg development discussions and patches <ffmpeg-devel at ffmpeg.org>
> Cc: Soft Works <softworkz-at-hotmail.com at ffmpeg.org>; softworkz
> <softworkz at hotmail.com>; Andreas Rheinhardt
> <andreas.rheinhardt at outlook.com>
> Subject: Re: [FFmpeg-devel] [PATCH v3 3/7] fftools/ffprobe: Rename
> writer_print_section_* and WriterContext
> 
> On date Saturday 2025-03-01 10:02:00 +0000, softworkz wrote:
> > From: softworkz <softworkz at hotmail.com>
> >
> > separated for better clarity of the preceding commit
> >
> > Signed-off-by: softworkz <softworkz at hotmail.com>
> > ren
> > ---
> >  fftools/ffprobe.c | 361 +++++++++++++++++++++++----------------------
> -
> >  1 file changed, 178 insertions(+), 183 deletions(-)
> >
> > diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
> > index f398057df7..4a90bc4824 100644
> > --- a/fftools/ffprobe.c
> > +++ b/fftools/ffprobe.c
> > @@ -71,11 +71,6 @@
> >
> >  #include "libavutil/thread.h"
> >
> > -// TEMPORARY DEFINES
> > -#define writer_print_section_header(w, d, s)
> avtext_print_section_header(w, d, s)
> > -#define writer_print_section_footer(w) avtext_print_section_footer(w)
> > -#define WriterContext AVTextFormatContext
> > -
> >  // attached as opaque_ref to packets/frames
> >  typedef struct FrameData {
> >      int64_t pkt_pos;
> > @@ -446,25 +441,25 @@ static void log_callback(void *ptr, int level,
> const char *fmt, va_list vl)
> >      memset( (ptr) + (cur_n), 0, ((new_n) - (cur_n)) * sizeof(*(ptr))
> ); \
> >  }
> >
> 
> > -static inline int show_tags(WriterContext *w, AVDictionary *tags, int
> section_id)
> > +static inline int show_tags(AVTextFormatContext *w, AVDictionary
> *tags, int section_id)
> 
> maybe while at it also change w to f or t?
> 

So I tried that (t) and it compiles, but FATE test are failing. I wasn't able to identify cause without going deeper, I don't know how exactly FATE tests are making use of ffprobe (or its code?).
Most likely there's a naming collision. I've renamed it to 'tfc'. It has two more letters but it has the advantage that it's a unique token in the file. It's isolated in the last commit, to you can also skip that last one if you prefer.

Thanks again for your effort
sw