Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

Use ff_neterrno instead of errno in tcp.c.

Browse source 
If ff_neterrno() is checked instead of errno, that's probably what should be
used in the return value.
As a sideeffect, this gives better compatibility with Windows (CE), where
network errors aren't visible in errno.)
patch by Martin Storsjö, martin martin st

Originally committed as revision 19433 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2009-07-15 05:52:49 +00:00 • committed by Diego Biurrun
parent d6a1611cc2
commit 73c1326809
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libavformat/tcp.c
View file

@ -130,7 +130,7 @@ static int tcp_read(URLContext *h, uint8_t *buf, int size)
if (len < 0) { if (len < 0) {
if (ff_neterrno() != FF_NETERROR(EINTR) && if (ff_neterrno() != FF_NETERROR(EINTR) &&
ff_neterrno() != FF_NETERROR(EAGAIN)) ff_neterrno() != FF_NETERROR(EAGAIN))
return AVERROR(errno); return AVERROR(ff_neterrno());
} else return len; } else return len;
} else if (ret < 0) { } else if (ret < 0) {
return -1; return -1;
@ -160,7 +160,7 @@ static int tcp_write(URLContext *h, uint8_t *buf, int size)
if (len < 0) { if (len < 0) {
if (ff_neterrno() != FF_NETERROR(EINTR) && if (ff_neterrno() != FF_NETERROR(EINTR) &&
ff_neterrno() != FF_NETERROR(EAGAIN)) ff_neterrno() != FF_NETERROR(EAGAIN))
return AVERROR(errno); return AVERROR(ff_neterrno());
continue; continue;
} }
size -= len; size -= len;