Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
27bb0783
Commit
27bb0783
authored
Jun 30, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
network: fix net_Read() documentation and match it in code
parent
5a68ec40
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
11 deletions
+6
-11
src/network/io.c
src/network/io.c
+6
-11
No files found.
src/network/io.c
View file @
27bb0783
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment