mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Use ff_neterrno instead of errno in tcp.c.
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:
parent
d6a1611cc2
commit
73c1326809
@ -130,7 +130,7 @@ static int tcp_read(URLContext *h, uint8_t *buf, int size)
|
||||
if (len < 0) {
|
||||
if (ff_neterrno() != FF_NETERROR(EINTR) &&
|
||||
ff_neterrno() != FF_NETERROR(EAGAIN))
|
||||
return AVERROR(errno);
|
||||
return AVERROR(ff_neterrno());
|
||||
} else return len;
|
||||
} else if (ret < 0) {
|
||||
return -1;
|
||||
@ -160,7 +160,7 @@ static int tcp_write(URLContext *h, uint8_t *buf, int size)
|
||||
if (len < 0) {
|
||||
if (ff_neterrno() != FF_NETERROR(EINTR) &&
|
||||
ff_neterrno() != FF_NETERROR(EAGAIN))
|
||||
return AVERROR(errno);
|
||||
return AVERROR(ff_neterrno());
|
||||
continue;
|
||||
}
|
||||
size -= len;
|
||||
|
Loading…
Reference in New Issue
Block a user