Mercurial > libavutil.hg
changeset 916:2860cc0b5562 libavutil
Make av_strerror() return -1 even in the case when av_strerror_r() is
not defined.
This allows applications to check if av_strerror() cannot provide a
meaningful representation for the provided error code, without having
to actually check the filled string.
| author | stefano |
|---|---|
| date | Wed, 05 May 2010 21:44:47 +0000 |
| parents | a1a27468a9c5 |
| children | 3ab411c447c4 |
| files | avutil.h error.c error.h |
| diffstat | 3 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/avutil.h Mon May 03 21:56:21 2010 +0000 +++ b/avutil.h Wed May 05 21:44:47 2010 +0000 @@ -41,7 +41,7 @@ #define LIBAVUTIL_VERSION_MAJOR 50 #define LIBAVUTIL_VERSION_MINOR 15 -#define LIBAVUTIL_VERSION_MICRO 0 +#define LIBAVUTIL_VERSION_MICRO 1 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \
--- a/error.c Mon May 03 21:56:21 2010 +0000 +++ b/error.c Wed May 05 21:44:47 2010 +0000 @@ -36,8 +36,10 @@ } else { #if HAVE_STRERROR_R ret = strerror_r(AVUNERROR(errnum), errbuf, errbuf_size); +#else + ret = -1; #endif - if (!HAVE_STRERROR_R || ret < 0) + if (ret < 0) snprintf(errbuf, errbuf_size, "Error number %d occurred", errnum); }
--- a/error.h Mon May 03 21:56:21 2010 +0000 +++ b/error.h Wed May 05 21:44:47 2010 +0000 @@ -64,7 +64,8 @@ * error message indicating the errnum provided to errbuf. * * @param errbuf_size the size in bytes of errbuf - * @return 0 on success, a negative value otherwise + * @return 0 on success, a negative value if a description for errnum + * cannot be found */ int av_strerror(int errnum, char *errbuf, size_t errbuf_size);