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
c881098b
Commit
c881098b
authored
Jun 30, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
network: use vlc_killed()
parent
ebb675de
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
src/network/io.c
src/network/io.c
+2
-2
src/network/tcp.c
src/network/tcp.c
+1
-1
src/network/tls.c
src/network/tls.c
+2
-2
No files found.
src/network/io.c
View file @
c881098b
...
@@ -237,7 +237,7 @@ ssize_t (net_Read)(vlc_object_t *restrict obj, int fd,
...
@@ -237,7 +237,7 @@ ssize_t (net_Read)(vlc_object_t *restrict obj, int fd,
do
do
{
{
if
(
!
vlc_object_alive
(
obj
))
if
(
vlc_killed
(
))
{
{
vlc_testcancel
();
vlc_testcancel
();
errno
=
EINTR
;
errno
=
EINTR
;
...
@@ -292,7 +292,7 @@ ssize_t (net_Write)(vlc_object_t *obj, int fd, const void *buf, size_t len)
...
@@ -292,7 +292,7 @@ ssize_t (net_Write)(vlc_object_t *obj, int fd, const void *buf, size_t len)
do
do
{
{
if
(
!
vlc_object_alive
(
obj
))
if
(
vlc_killed
(
))
{
{
vlc_testcancel
();
vlc_testcancel
();
errno
=
EINTR
;
errno
=
EINTR
;
...
...
src/network/tcp.c
View file @
c881098b
...
@@ -167,7 +167,7 @@ int net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port,
...
@@ -167,7 +167,7 @@ int net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port,
do
/* NOTE: timeout screwed up if we catch a signal (EINTR) */
do
/* NOTE: timeout screwed up if we catch a signal (EINTR) */
{
{
if
(
!
vlc_object_alive
(
p_this
))
if
(
vlc_killed
(
))
goto
next_ai
;
goto
next_ai
;
val
=
vlc_poll_i11e
(
&
ufd
,
1
,
timeout
);
val
=
vlc_poll_i11e
(
&
ufd
,
1
,
timeout
);
...
...
src/network/tls.c
View file @
c881098b
...
@@ -247,7 +247,7 @@ int vlc_tls_Read(vlc_tls_t *session, void *buf, size_t len, bool waitall)
...
@@ -247,7 +247,7 @@ int vlc_tls_Read(vlc_tls_t *session, void *buf, size_t len, bool waitall)
for
(
size_t
rcvd
=
0
;;)
for
(
size_t
rcvd
=
0
;;)
{
{
if
(
!
vlc_object_alive
(
session
->
p_parent
))
if
(
vlc_killed
(
))
{
{
errno
=
EINTR
;
errno
=
EINTR
;
return
-
1
;
return
-
1
;
...
@@ -280,7 +280,7 @@ int vlc_tls_Write(vlc_tls_t *session, const void *buf, size_t len)
...
@@ -280,7 +280,7 @@ int vlc_tls_Write(vlc_tls_t *session, const void *buf, size_t len)
for
(
size_t
sent
=
0
;;)
for
(
size_t
sent
=
0
;;)
{
{
if
(
!
vlc_object_alive
(
session
->
p_parent
))
if
(
vlc_killed
(
))
{
{
errno
=
EINTR
;
errno
=
EINTR
;
return
-
1
;
return
-
1
;
...
...
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