[vlc-commits] http: remove useless vlc_object_alive() calls
Rémi Denis-Courmont
git at videolan.org
Thu Jun 4 18:54:14 CEST 2015
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jun 4 19:52:36 2015 +0300| [1ef2e1594a65ba5006ad5f1bffd475dfc4c83c35] | committer: Rémi Denis-Courmont
http: remove useless vlc_object_alive() calls
The net_* and vlc_tls_* functions will return errors.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1ef2e1594a65ba5006ad5f1bffd475dfc4c83c35
---
modules/access/http.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/access/http.c b/modules/access/http.c
index 4659453..4001438 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -416,7 +416,7 @@ connect:
p_sys->i_version = 0;
p_sys->b_seekable = false;
- if( !vlc_object_alive (p_access) || Connect( p_access, 0 ) )
+ if( Connect( p_access, 0 ) )
goto error;
case 0:
@@ -750,7 +750,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
p_sys->b_continuous = true;
}
Disconnect( p_access );
- if( p_sys->b_reconnect && vlc_object_alive( p_access ) )
+ if( p_sys->b_reconnect )
{
msg_Dbg( p_access, "got disconnected, trying to reconnect" );
if( Connect( p_access, p_access->info.i_pos ) )
@@ -1116,7 +1116,7 @@ static int Connect( access_t *p_access, uint64_t i_tell )
free( psz );
- if( !vlc_object_alive (p_access) || p_sys->b_error )
+ if( p_sys->b_error )
{
Disconnect( p_access );
return -1;
@@ -1274,7 +1274,7 @@ static int Request( access_t *p_access, uint64_t i_tell )
goto error;
}
- if( !vlc_object_alive (p_access) || p_sys->b_error )
+ if( p_sys->b_error )
{
free( psz );
goto error;
More information about the vlc-commits
mailing list