[PATCH 7/8] Implement av_strerror().

[Stefano Sabatini]

---
 libavutil/Makefile |    1 +
 libavutil/avutil.h |    2 +-
 libavutil/error.c  |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 libavutil/error.h  |   11 +++++++++++
 4 files changed, 64 insertions(+), 1 deletions(-)
 create mode 100644 libavutil/error.c

diff --git a/libavutil/Makefile b/libavutil/Makefile
index 5b6cd0e..79506c0 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -30,6 +30,7 @@ OBJS = adler32.o                                                        \
        base64.o                                                         \
        crc.o                                                            \
        des.o                                                            \
+       error.o                                                          \
        fifo.o                                                           \
        intfloat_readwrite.o                                             \
        lfg.o                                                            \
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 47630a7..968787c 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -40,7 +40,7 @@
 #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
 
 #define LIBAVUTIL_VERSION_MAJOR 50
-#define LIBAVUTIL_VERSION_MINOR 12
+#define LIBAVUTIL_VERSION_MINOR 13
 #define LIBAVUTIL_VERSION_MICRO  0
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
diff --git a/libavutil/error.c b/libavutil/error.c
new file mode 100644
index 0000000..d299179
--- /dev/null
+++ b/libavutil/error.c
@@ -0,0 +1,51 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "avutil.h"
+#include "avstring.h"
+
+int av_strerror(int errnum, char *errbuf, size_t errbuf_size)
+{
+    int ret = 0;
+
+    switch (errnum) {
+#define HANDLE_ERROR(ERR, ERRSTR) case AVERROR_##ERR: av_strlcpy(errbuf, ERRSTR, errbuf_size); break
+
+#if LIBAVUTIL_VERSION_MAJOR < 51
+    HANDLE_ERROR(IO            , "I/O error");
+    HANDLE_ERROR(NOENT         , "No such file or directory");
+    HANDLE_ERROR(NOMEM         , "Not enough memory");
+#endif
+    HANDLE_ERROR(EOF           , "End of file");
+    HANDLE_ERROR(INVALIDDATA   , "Invalid data found");
+    HANDLE_ERROR(NOFMT         , "Unknown format");
+    HANDLE_ERROR(NOTSUPP       , "Operation not supported");
+    HANDLE_ERROR(NUMEXPECTED   , "Number syntax expected in filename");
+    HANDLE_ERROR(PATCHWELCOME  , "Not yet implemented in FFmpeg, patches welcome");
+
+    default:
+#if _POSIX_C_SOURCE >= 200112L
+        ret = strerror_r(AVUNERROR(errnum), errbuf, errbuf_size);
+#else
+        av_strlcatf(errbuf, errbuf_size, "Error number %d", AVUNERROR(errnum));
+#endif
+    }
+
+    return ret;
+}
+
diff --git a/libavutil/error.h b/libavutil/error.h
index 060defc..cea4f54 100644
--- a/libavutil/error.h
+++ b/libavutil/error.h
@@ -56,4 +56,15 @@
 #define AVERROR_NUMEXPECTED     (-MKTAG('N','U','E','X')) /**< Number syntax expected in filename. */
 #endif
 
+/**
+ * Puts in errbuf a string containing the description of the AVERROR
+ * error code errnum.
+ * In case of failure errno is set to indicate the error.
+ *
+ * @param errbuf buffer where the string containing the error description is put
+ * @param errbuf_size the size in bytes of errbuf
+ * @return 0 on success, -1 otherwise
+ */
+int av_strerror(int errnum, char *errbuf, size_t errbuf_size);
+
 #endif /* AVUTIL_ERROR_H */
-- 
1.6.6.1


--YZ5djTAD1cGYuMQK
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0008-Use-av_strerror-in-print_error.patch"