[FFmpeg-devel,2/3] fftools/ffprobe: Use av_err2str

Message ID 20221004144008.89188-2-epirat07@gmail.com
State Accepted
Commit 88635c7f953ebae9e1beced0e4ecb5f026f47dde
Headers
Series [FFmpeg-devel,1/3] fftools/cmdutils: Use av_err2str |

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Marvin Scholz Oct. 4, 2022, 2:40 p.m. UTC
av_err2str which is a wrapper for av_strerror already calls
strerror_r if available and if not has a fallback for the other
error codes that would be handled by that, so manually calling
strerror again if it fails is not necessary.
---
 fftools/ffprobe.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
  

Patch

diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
index 421ada5bd8..9b7e82fd8c 100644
--- a/fftools/ffprobe.c
+++ b/fftools/ffprobe.c
@@ -3279,15 +3279,9 @@  static int show_format(WriterContext *w, InputFile *ifile)
 
 static void show_error(WriterContext *w, int err)
 {
-    char errbuf[128];
-    const char *errbuf_ptr = errbuf;
-
-    if (av_strerror(err, errbuf, sizeof(errbuf)) < 0)
-        errbuf_ptr = strerror(AVUNERROR(err));
-
     writer_print_section_header(w, SECTION_ID_ERROR);
     print_int("code", err);
-    print_str("string", errbuf_ptr);
+    print_str("string", av_err2str(err));
     writer_print_section_footer(w);
 }