Skip to content

V
vlc-2-2
Commit fa0e80f2 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Remove the unneeded vlc_object_destroy logger hack, and fix wrapping. 

Signed-off-by: default avatarRémi Denis-Courmont <rem@videolan.org>
parent b96154a2
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 23 deletions
src/misc/objects.c
View file @ fa0e80f2
...@@ -359,26 +359,24 @@ static void vlc_object_destroy( vlc_object_t *p_this ) ...@@ -359,26 +359,24 @@ static void vlc_object_destroy( vlc_object_t *p_this )
{ {
vlc_object_internals_t *p_priv = vlc_internals( p_this ); vlc_object_internals_t *p_priv = vlc_internals( p_this );
/* FIXME: ugly hack - we cannot use the message queue after
* msg_Destroy(). */
vlc_object_t *logger = p_this;
if( (vlc_object_t *)p_this->p_libvlc == p_this )
logger = NULL;
/* Sanity checks */ /* Sanity checks */
if( p_this->i_children ) if( p_this->i_children )
{ {
int i; int i;
fprintf( stderr, "ERROR: cannot delete object (%i, %s) with %d children\n", fprintf( stderr,
p_this->i_object_id, p_this->psz_object_name, p_this->i_children ); "ERROR: cannot delete object (%i, %s) with %d children\n",
p_this->i_object_id, p_this->psz_object_name,
p_this->i_children );
for( i = 0; i < p_this->i_children; i++ ) for( i = 0; i < p_this->i_children; i++ )
{ {
fprintf( stderr, "ERROR: Remaining children object (id:%i, type:%s, name:%s)\n", fprintf( stderr,
p_this->pp_children[i]->i_object_id, "ERROR: Remaining children object "
p_this->pp_children[i]->psz_object_type, "(id:%i, type:%s, name:%s)\n",
p_this->pp_children[i]->psz_object_name ); p_this->pp_children[i]->i_object_id,
p_this->pp_children[i]->psz_object_type,
p_this->pp_children[i]->psz_object_name );
} }
fflush(stderr); fflush(stderr);
abort(); abort();
...@@ -386,13 +384,13 @@ static void vlc_object_destroy( vlc_object_t *p_this ) ...@@ -386,13 +384,13 @@ static void vlc_object_destroy( vlc_object_t *p_this )
if( p_this->p_parent ) if( p_this->p_parent )
{ {
fprintf( stderr, "ERROR: cannot delete object (id:%i, type:%s, name:%s) with a parent (id:%i, type:%s, name:%s)\n", fprintf( stderr,
p_this->i_object_id, "ERROR: cannot delete object (id:%i, type:%s, name:%s) "
p_this->psz_object_type, "with a parent (id:%i, type:%s, name:%s)\n",
p_this->psz_object_name, p_this->i_object_id, p_this->psz_object_type,
p_this->p_parent->i_object_id, p_this->psz_object_name, p_this->p_parent->i_object_id,
p_this->p_parent->psz_object_type, p_this->p_parent->psz_object_type,
p_this->p_parent->psz_object_name ); p_this->p_parent->psz_object_name );
fflush(stderr); fflush(stderr);
abort(); abort();
} }
...@@ -421,10 +419,10 @@ static void vlc_object_destroy( vlc_object_t *p_this ) ...@@ -421,10 +419,10 @@ static void vlc_object_destroy( vlc_object_t *p_this )
{ {
/* We are leaking this object */ /* We are leaking this object */
fprintf( stderr, fprintf( stderr,
"ERROR: We are leaking object (id:%i, type:%s, name:%s)\n", "ERROR: leaking object (id:%i, type:%s, name:%s)\n",
p_global->pp_objects[i]->i_object_id, p_global->pp_objects[i]->i_object_id,
p_global->pp_objects[i]->psz_object_type, p_global->pp_objects[i]->psz_object_type,
p_global->pp_objects[i]->psz_object_name ); p_global->pp_objects[i]->psz_object_name );
fflush(stderr); fflush(stderr);
} }
/* Strongly abort, cause we want these to be fixed */ /* Strongly abort, cause we want these to be fixed */
......
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