[PATCH 5/8] Replace all the occurrences of AVERROR_EIO with AVERROR(EIO), and mark for deletion AVERROR_EIO at the next major bump.

[Stefano Sabatini]

---
 libavdevice/alsa-audio-common.c |    6 +++---
 libavdevice/vfwcap.c            |    6 +++---
 libavformat/ape.c               |    4 ++--
 libavformat/cafdec.c            |    8 ++++----
 libavformat/flacdec.c           |    2 +-
 libavformat/soxdec.c            |    2 +-
 libavutil/error.h               |    2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/libavdevice/alsa-audio-common.c b/libavdevice/alsa-audio-common.c
index e125b2d..5bd0b49 100644
--- a/libavdevice/alsa-audio-common.c
+++ b/libavdevice/alsa-audio-common.c
@@ -74,7 +74,7 @@ av_cold int ff_alsa_open(AVFormatContext *ctx, snd_pcm_stream_t mode,
     if (res < 0) {
         av_log(ctx, AV_LOG_ERROR, "cannot open audio device %s (%s)\n",
                audio_device, snd_strerror(res));
-        return AVERROR_IO;
+        return AVERROR(EIO);
     }
 
     res = snd_pcm_hw_params_malloc(&hw_params);
@@ -153,7 +153,7 @@ fail:
     snd_pcm_hw_params_free(hw_params);
 fail1:
     snd_pcm_close(h);
-    return AVERROR_IO;
+    return AVERROR(EIO);
 }
 
 av_cold int ff_alsa_close(AVFormatContext *s1)
@@ -175,7 +175,7 @@ int ff_alsa_xrun_recover(AVFormatContext *s1, int err)
         if (err < 0) {
             av_log(s1, AV_LOG_ERROR, "cannot recover from underrun (snd_pcm_prepare failed: %s)\n", snd_strerror(err));
 
-            return AVERROR_IO;
+            return AVERROR(EIO);
         }
     } else if (err == -ESTRPIPE) {
         av_log(s1, AV_LOG_ERROR, "-ESTRPIPE... Unsupported!\n");
diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c
index 9171457..3aaa5db 100644
--- a/libavdevice/vfwcap.c
+++ b/libavdevice/vfwcap.c
@@ -240,7 +240,7 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap)
 
     if(!ap->time_base.den) {
         av_log(s, AV_LOG_ERROR, "A time base must be specified.\n");
-        return AVERROR_IO;
+        return AVERROR(EIO);
     }
 
     ctx->s = s;
@@ -248,7 +248,7 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap)
     ctx->hwnd = capCreateCaptureWindow(NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, 0);
     if(!ctx->hwnd) {
         av_log(s, AV_LOG_ERROR, "Could not create capture window.\n");
-        return AVERROR_IO;
+        return AVERROR(EIO);
     }
 
     /* If atoi fails, devnum==0 and the default device is used */
@@ -390,7 +390,7 @@ fail_bi:
 
 fail_io:
     vfw_read_close(s);
-    return AVERROR_IO;
+    return AVERROR(EIO);
 }
 
 static int vfw_read_packet(AVFormatContext *s, AVPacket *pkt)
diff --git a/libavformat/ape.c b/libavformat/ape.c
index a881138..b5f93cf 100644
--- a/libavformat/ape.c
+++ b/libavformat/ape.c
@@ -338,9 +338,9 @@ static int ape_read_packet(AVFormatContext * s, AVPacket * pkt)
     uint32_t extra_size = 8;
 
     if (url_feof(s->pb))
-        return AVERROR_IO;
+        return AVERROR(EIO);
     if (ape->currentframe > ape->totalframes)
-        return AVERROR_IO;
+        return AVERROR(EIO);
 
     url_fseek (s->pb, ape->frames[ape->currentframe].pos, SEEK_SET);
 
diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
index c4aad1b..df29716 100644
--- a/libavformat/cafdec.c
+++ b/libavformat/cafdec.c
@@ -293,13 +293,13 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
     int64_t left      = CAF_MAX_PKT_SIZE;
 
     if (url_feof(pb))
-        return AVERROR_IO;
+        return AVERROR(EIO);
 
     /* don't read past end of data chunk */
     if (caf->data_size > 0) {
         left = (caf->data_start + caf->data_size) - url_ftell(pb);
         if (left <= 0)
-            return AVERROR_IO;
+            return AVERROR(EIO);
     }
 
     pkt_frames = caf->frames_per_packet;
@@ -317,12 +317,12 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
             pkt_size   = caf->num_bytes - st->index_entries[caf->packet_cnt].pos;
             pkt_frames = st->duration   - st->index_entries[caf->packet_cnt].timestamp;
         } else {
-            return AVERROR_IO;
+            return AVERROR(EIO);
         }
     }
 
     if (pkt_size == 0 || pkt_frames == 0 || pkt_size > left)
-        return AVERROR_IO;
+        return AVERROR(EIO);
 
     res = av_get_packet(pb, pkt, pkt_size);
     if (res < 0)
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c
index 067d4fa..c9ad191 100644
--- a/libavformat/flacdec.c
+++ b/libavformat/flacdec.c
@@ -70,7 +70,7 @@ static int flac_read_header(AVFormatContext *s,
             }
             if (get_buffer(s->pb, buffer, metadata_size) != metadata_size) {
                 av_freep(&buffer);
-                return AVERROR_IO;
+                return AVERROR(EIO);
             }
             break;
         /* skip metadata block for unsupported types */
diff --git a/libavformat/soxdec.c b/libavformat/soxdec.c
index ceaedec..0151efe 100644
--- a/libavformat/soxdec.c
+++ b/libavformat/soxdec.c
@@ -97,7 +97,7 @@ static int sox_read_header(AVFormatContext *s,
         char *comment = av_malloc(comment_size+1);
         if (get_buffer(pb, comment, comment_size) != comment_size) {
             av_freep(&comment);
-            return AVERROR_IO;
+            return AVERROR(EIO);
         }
         comment[comment_size] = 0;
 
diff --git a/libavutil/error.h b/libavutil/error.h
index 7536fcf..ee4ba8b 100644
--- a/libavutil/error.h
+++ b/libavutil/error.h
@@ -44,8 +44,8 @@
 
 #if LIBAVUTIL_VERSION_MAJOR < 51
 #define AVERROR_UNKNOWN     AVERROR(EINVAL)  /**< unknown error */
-#endif
 #define AVERROR_IO          AVERROR(EIO)     /**< I/O error */
+#endif
 #define AVERROR_NUMEXPECTED AVERROR(EDOM)    /**< Number syntax expected in filename. */
 #define AVERROR_INVALIDDATA AVERROR(EINVAL)  /**< invalid data found */
 #define AVERROR_NOMEM       AVERROR(ENOMEM)  /**< not enough memory */
-- 
1.6.6.1


--YiEDa0DAkWCtVeE4
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0006-Mark-AVERROR_ENOMEM-to-be-deleted-at-the-next-major-.patch"