From ce186430e261d636d232c0fedef3f58719351f17 Mon Sep 17 00:00:00 2001 From: Jean-Paul Saman <jpsaman@videolan.org> Date: Sat, 10 Mar 2007 18:44:15 +0000 Subject: [PATCH] Revert [19273] because these asserts are meant to catch serious programming errors. Thanks zorglub for enlightning me. --- src/playlist/control.c | 2 -- src/playlist/engine.c | 3 +-- src/playlist/search.c | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/playlist/control.c b/src/playlist/control.c index e961354459..a7e2ea241d 100644 --- a/src/playlist/control.c +++ b/src/playlist/control.c @@ -75,8 +75,6 @@ static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args { p_node = p_playlist->status.p_node; assert( p_node ); - if( !p_node ) - break; } p_playlist->request.i_status = PLAYLIST_RUNNING; p_playlist->request.i_skip = 0; diff --git a/src/playlist/engine.c b/src/playlist/engine.c index fcbffa5ba8..d405e41107 100644 --- a/src/playlist/engine.c +++ b/src/playlist/engine.c @@ -594,8 +594,7 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj ) vlc_mutex_unlock( &p_obj->object_lock ); if( p_item ) { - if( !p_item->p_meta ) - return; + assert( p_item->p_meta ); if( !b_fetch_art ) { input_MetaFetch( p_playlist, p_item ); diff --git a/src/playlist/search.c b/src/playlist/search.c index 9f8402deab..c831566e33 100644 --- a/src/playlist/search.c +++ b/src/playlist/search.c @@ -87,8 +87,7 @@ playlist_item_t * playlist_ItemGetByInputId( playlist_t *p_playlist, playlist_item_t *p_root ) { int i; - - if( !p_root ) return NULL; + assert( p_root != NULL ); for( i = 0 ; i< p_root->i_children ; i++ ) { if( p_root->pp_children[i]->i_children == -1 && -- 2.25.4