[FFmpeg-cvslog] avutil/file: use av_err2str to simplify code

Marvin Scholz git at videolan.org
Fri Sep 13 01:36:35 EEST 2024


ffmpeg | branch: master | Marvin Scholz <epirat07 at gmail.com> | Sun Sep  8 21:43:39 2024 +0200| [5dfc547f257ac13c16d8103ecb473996944bd25f] | committer: Marvin Scholz

avutil/file: use av_err2str to simplify code

No need to explicitly specify the buffer here as it is only
ever passed to av_log, so av_err2str can be used.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5dfc547f257ac13c16d8103ecb473996944bd25f
---

 libavutil/file.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/libavutil/file.c b/libavutil/file.c
index 2d1063b6a2..db8507286b 100644
--- a/libavutil/file.c
+++ b/libavutil/file.c
@@ -60,21 +60,18 @@ int av_file_map(const char *filename, uint8_t **bufptr, size_t *size,
     struct stat st;
     av_unused void *ptr;
     off_t off_size;
-    char errbuf[128];
     *bufptr = NULL;
     *size = 0;
 
     if (fd < 0) {
         err = AVERROR(errno);
-        av_strerror(err, errbuf, sizeof(errbuf));
-        av_log(&file_log_ctx, AV_LOG_ERROR, "Cannot read file '%s': %s\n", filename, errbuf);
+        av_log(&file_log_ctx, AV_LOG_ERROR, "Cannot read file '%s': %s\n", filename, av_err2str(err));
         return err;
     }
 
     if (fstat(fd, &st) < 0) {
         err = AVERROR(errno);
-        av_strerror(err, errbuf, sizeof(errbuf));
-        av_log(&file_log_ctx, AV_LOG_ERROR, "Error occurred in fstat(): %s\n", errbuf);
+        av_log(&file_log_ctx, AV_LOG_ERROR, "Error occurred in fstat(): %s\n", av_err2str(err));
         close(fd);
         return err;
     }
@@ -97,8 +94,7 @@ int av_file_map(const char *filename, uint8_t **bufptr, size_t *size,
     ptr = mmap(NULL, *size, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
     if (ptr == MAP_FAILED) {
         err = AVERROR(errno);
-        av_strerror(err, errbuf, sizeof(errbuf));
-        av_log(&file_log_ctx, AV_LOG_ERROR, "Error occurred in mmap(): %s\n", errbuf);
+        av_log(&file_log_ctx, AV_LOG_ERROR, "Error occurred in mmap(): %s\n", av_err2str(err));
         close(fd);
         *size = 0;
         return err;



More information about the ffmpeg-cvslog mailing list