Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
4396c68b
Commit
4396c68b
authored
Feb 14, 2010
by
Rémi Denis-Courmont
Browse files
net_Write: always a cancellation point as promised
parent
2932220e
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/network/io.c
View file @
4396c68b
...
...
@@ -428,8 +428,11 @@ ssize_t net_Write( vlc_object_t *p_this, int fd, const v_socket_t *p_vs,
{
.
fd
=
vlc_object_waitpipe
(
p_this
),
.
events
=
POLLIN
},
};
if
(
ufd
[
1
].
fd
==
-
1
)
if
(
unlikely
(
ufd
[
1
].
fd
==
-
1
))
{
vlc_testcancel
();
return
-
1
;
}
while
(
i_data
>
0
)
{
...
...
@@ -486,6 +489,9 @@ ssize_t net_Write( vlc_object_t *p_this, int fd, const v_socket_t *p_vs,
i_total
+=
val
;
}
if
(
unlikely
(
i_data
==
0
))
vlc_testcancel
();
/* corner case */
if
((
i_total
>
0
)
||
(
i_data
==
0
))
return
i_total
;
...
...
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