diff options
| author | Martin Storsjö <martin@martin.st> | 2011-02-19 19:14:11 +0100 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-02-23 07:21:31 -0500 |
| commit | 28c4741a6617a4c1d2490cb13fc70ae4c9c472da (patch) | |
| tree | 492c04df564f16ba9fd634c29eb4ea69154dab87 /libavformat/tcp.c | |
| parent | 8f935b9271052be8f97d655081b94b68b6c23bfb (diff) | |
libavformat: Remove FF_NETERRNO()
Map EAGAIN and EINTR from ff_neterrno to the normal AVERROR()
error codes. Provide fallback definitions of other errno.h network
errors, mapping them to the corresponding winsock errors.
This eases catching these error codes in common code, without having
to distinguish between FF_NETERRNO(EAGAIN) and AVERROR(EAGAIN).
This fixes roundup issue 2614, unbreaking blocking network IO on
windows.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavformat/tcp.c')
| -rw-r--r-- | libavformat/tcp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/tcp.c b/libavformat/tcp.c index 29eb60abe9..b01f0b85bf 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -72,13 +72,13 @@ static int tcp_open(URLContext *h, const char *uri, int flags) ret = connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen); if (ret < 0) { struct pollfd p = {fd, POLLOUT, 0}; - if (ff_neterrno() == FF_NETERROR(EINTR)) { + if (ff_neterrno() == AVERROR(EINTR)) { if (url_interrupt_cb()) goto fail1; goto redo; } - if (ff_neterrno() != FF_NETERROR(EINPROGRESS) && - ff_neterrno() != FF_NETERROR(EAGAIN)) + if (ff_neterrno() != AVERROR(EINPROGRESS) && + ff_neterrno() != AVERROR(EAGAIN)) goto fail; /* wait until we are connected or until abort */ @@ -136,7 +136,7 @@ static int tcp_wait_fd(int fd, int write) int ret; ret = poll(&p, 1, 100); - return ret < 0 ? ff_neterrno() : p.revents & ev ? 0 : FF_NETERROR(EAGAIN); + return ret < 0 ? ff_neterrno() : p.revents & ev ? 0 : AVERROR(EAGAIN); } static int tcp_read(URLContext *h, uint8_t *buf, int size) |