Removes trailing spaces. Removes tabs.

[vlc] / src / misc / events.c

diff --git a/src/misc/events.c b/src/misc/events.c
index 45a02b4cac81533d4e7f7aa7f1e11fb58344ccf0..6e056f7ff777880b57095e83b48164b23b8c948d 100644 (file)
--- a/src/misc/events.c
+++ b/src/misc/events.c
@@ -61,7 +61,7 @@ typedef struct vlc_event_listeners_group_t
 } vlc_event_listeners_group_t;
 
 #ifdef DEBUG_EVENT
-static const char * ppsz_event_type_to_name[] = 
+static const char * ppsz_event_type_to_name[] =
 {
     [vlc_InputItemMetaChanged]          = "vlc_InputItemMetaChanged",
     [vlc_InputItemSubItemAdded]         = "vlc_InputItemSubItemAdded",
@@ -71,7 +71,7 @@ static const char * ppsz_event_type_to_name[] =
 #endif
 
 /*****************************************************************************
- * 
+ *
  *****************************************************************************/
 
 /**
@@ -105,8 +105,10 @@ void vlc_event_manager_fini( vlc_event_manager_t * p_em )
         FOREACH_ARRAY( listener, listeners_group->listeners )
             free( listener );
         FOREACH_END()
+        ARRAY_RESET( listeners_group->listeners );
         free( listeners_group );
     FOREACH_END()
+    ARRAY_RESET( p_em->listeners_groups );
 }
 
 /**
@@ -124,7 +126,7 @@ int vlc_event_manager_register_event_type(
 
     listeners_group->event_type = event_type;
     ARRAY_INIT( listeners_group->listeners );
-    
+ 
     vlc_mutex_lock( &p_em->object_lock );
     ARRAY_APPEND( p_em->listeners_groups, listeners_group );
     vlc_mutex_unlock( &p_em->object_lock );
@@ -161,6 +163,7 @@ void vlc_event_send( vlc_event_manager_t * p_em,
             if( !array_of_cached_listeners )
             {
                 msg_Err( p_em->p_parent_object, "Not enough memory in vlc_event_send" );
+                vlc_mutex_unlock( &p_em->object_lock );
                 return;
             }
 
@@ -170,14 +173,14 @@ void vlc_event_send( vlc_event_manager_t * p_em,
 #ifdef DEBUG_EVENT
                 cached_listener->psz_debug_name = strdup(cached_listener->psz_debug_name);
 #endif
-                cached_listener += sizeof(vlc_event_listener_t);
+                cached_listener++;
             FOREACH_END()
 
             break;
         }
     FOREACH_END()
     vlc_mutex_unlock( &p_em->object_lock );
-    
+ 
     /* Call the function attached */
     cached_listener = array_of_cached_listeners;
     for( i = 0; i < i_cached_listeners; i++ )
@@ -192,7 +195,7 @@ void vlc_event_send( vlc_event_manager_t * p_em,
 #endif
 
         cached_listener->pf_callback( p_event, cached_listener->p_user_data );
-        cached_listener += sizeof(vlc_event_listener_t) ;
+        cached_listener++;
     }
     free( array_of_cached_listeners );
 
@@ -212,7 +215,7 @@ int __vlc_event_attach( vlc_event_manager_t * p_em,
     listener = malloc(sizeof(vlc_event_listener_t));
     if( !listener )
         return VLC_ENOMEM;
-    
+ 
     listener->p_user_data = p_user_data;
     listener->pf_callback = pf_callback;
 #ifdef DEBUG_EVENT