Commit 27bb0783 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

network: fix net_Read() documentation and match it in code

parent 5a68ec40
...@@ -224,13 +224,12 @@ int *net_Listen (vlc_object_t *p_this, const char *psz_host, ...@@ -224,13 +224,12 @@ int *net_Listen (vlc_object_t *p_this, const char *psz_host,
return sockv; return sockv;
} }
/***************************************************************************** /**
* net_Read: * Reads data from a socket, blocking until all requested data is received or
***************************************************************************** * the end of the stream is reached.
* Reads from a network socket. Cancellation point. * This function is a cancellation point.
* We repeat until we have read the right amount of data; * @return -1 on error, or the number of bytes of read.
* a short count means EOF has been reached or an error. */
*****************************************************************************/
ssize_t (net_Read)(vlc_object_t *restrict obj, int fd, ssize_t (net_Read)(vlc_object_t *restrict obj, int fd,
void *restrict buf, size_t len) void *restrict buf, size_t len)
{ {
...@@ -245,11 +244,7 @@ ssize_t (net_Read)(vlc_object_t *restrict obj, int fd, ...@@ -245,11 +244,7 @@ ssize_t (net_Read)(vlc_object_t *restrict obj, int fd,
return -1; return -1;
} }
#ifndef _WIN32
ssize_t val = vlc_read_i11e(fd, buf, len);
#else
ssize_t val = vlc_recv_i11e(fd, buf, len, 0); ssize_t val = vlc_recv_i11e(fd, buf, len, 0);
#endif
if (val < 0) if (val < 0)
{ {
if (errno == EINTR || errno == EAGAIN) if (errno == EINTR || errno == EAGAIN)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment