Changeset 38f820eb5928f2074a604a2faafdaae7ac594001

Timestamp:

05/14/08 20:17:24 (3 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1210789044 +0300

git-parent:

[c79a340d36130d8f4bd4898a0c076de2472b52ef]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1210789044 +0300

Message:

Inline DetachObject?

Files:

• src/misc/objects.c (modified) (3 diffs)

src/misc/objects.c

@@ -71 +71 @@
-static vlc_object_t * FindObject    ( vlc_object_t *, int, int );
-static vlc_object_t * FindObjectName( vlc_object_t *, const char *, int );
-static void           DetachObject  ( vlc_object_t * );
-static void           PrintObject   ( vlc_object_t *, const char * );
-static void           DumpStructure ( vlc_object_t *, int, char * );
@@ -916 +915 @@
-    assert (p_this->p_parent);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1352 +1380 @@
-}
-
-static void DetachObject( vlc_object_t *p_this )
-{
-    vlc_object_t *p_parent = p_this->p_parent;
-    int i_index, i;
-
-    /* Remove p_this's parent */
-    p_this->p_parent = NULL;
-
-    /* Remove all of p_parent's children which are p_this */
-    for( i_index = p_parent->i_children ; i_index-- ; )
-    {
-        if( p_parent->pp_children[i_index] == p_this )
-        {
-            p_parent->i_children--;
-            for( i = i_index ; i < p_parent->i_children ; i++ )
-            {
-                p_parent->pp_children[i] = p_parent->pp_children[i+1];
-            }
-        }
-    }
-
-    if( p_parent->i_children )
-    {
-        p_parent->pp_children = (vlc_object_t **)realloc( p_parent->pp_children,
-                               p_parent->i_children * sizeof(vlc_object_t *) );
-    }
-    else
-    {
-        free( p_parent->pp_children );
-        p_parent->pp_children = NULL;
-    }
-}
-
-
-static void PrintObject( vlc_object_t *p_this, const char *psz_prefix )