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

network: use vlc_killed()

parent ebb675de
...@@ -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;
......
...@@ -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);
......
...@@ -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;
......
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