[FFmpeg-cvslog] r23031 - in trunk/libavutil: avutil.h error.c error.h

[stefano]

Author: stefano
Date: Wed May  5 23:44:47 2010
New Revision: 23031

Log:
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.

Modified:
   trunk/libavutil/avutil.h
   trunk/libavutil/error.c
   trunk/libavutil/error.h

Modified: trunk/libavutil/avutil.h
==============================================================================
--- trunk/libavutil/avutil.h	Wed May  5 23:38:02 2010	(r23030)
+++ trunk/libavutil/avutil.h	Wed May  5 23:44:47 2010	(r23031)
@@ -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, \

Modified: trunk/libavutil/error.c
==============================================================================
--- trunk/libavutil/error.c	Wed May  5 23:38:02 2010	(r23030)
+++ trunk/libavutil/error.c	Wed May  5 23:44:47 2010	(r23031)
@@ -36,8 +36,10 @@ int av_strerror(int errnum, char *errbuf
     } 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);
     }
 

Modified: trunk/libavutil/error.h
==============================================================================
--- trunk/libavutil/error.h	Wed May  5 23:38:02 2010	(r23030)
+++ trunk/libavutil/error.h	Wed May  5 23:44:47 2010	(r23031)
@@ -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);