Changeset 319e629d2c640cde2f7c42ab7429d5f324273a0b

Timestamp:

29/10/02 14:22:48 (6 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1035897768 +0000

git-parent:

[1063d36a28921d6517718d91ccf06c7091c6c38d]

git-author:

Sam Hocevar <sam@videolan.org> 1035897768 +0000

Message:

• ./include/vlc_common.h: defined the INSERT_ELEM and REMOVE_ELEM macros
  which are a generic use of the realloc/memmove/index++ scheme we use for
  dynamic arrays.
  
• ./src/misc/variables.c: properly free the choice list upon variable
  destruction.
  

Files:

• include/vlc_common.h (modified) (2 diffs)
• src/input/input_dec.c (modified) (2 diffs)
• src/input/input_programs.c (modified) (11 diffs)
• src/misc/messages.c (modified) (3 diffs)
• src/misc/objects.c (modified) (5 diffs)
• src/misc/variables.c (modified) (9 diffs)
• src/playlist/playlist.c (modified) (6 diffs)

include/vlc_common.h

@@ -4 +4 @@
- *****************************************************************************
- * Copyright (C) 1998, 1999, 2000 VideoLAN
-2 2002/10/25 09:21:09
+3 2002/10/29 13:22:47
- *
- * Authors: Samuel Hocevar <sam@via.ecp.fr>
@@ -346 +346 @@
-#   define __MIN(a, b)   ( ((a) < (b)) ? (a) : (b) )
-#endif
+
+/* Dynamic array handling: realloc array, move data, increment position */
+#define INSERT_ELEM( p_ar, i_oldsize, i_pos, elem )                           \
+    do                                                                        \
+    {                                                                         \
+        if( i_oldsize )                                                       \
+        {                                                                     \
+            (p_ar) = realloc( p_ar, ((i_oldsize) + 1) * sizeof( *(p_ar) ) );  \
+        }                                                                     \
+        else                                                                  \
+        {                                                                     \
+            (p_ar) = malloc( ((i_oldsize) + 1) * sizeof( *(p_ar) ) );         \
+        }                                                                     \
+        memmove( (p_ar) + (i_pos) + 1,                                        \
+                 (p_ar) + (i_pos),                                            \
+                 ((i_oldsize) - (i_pos)) * sizeof( *(p_ar) ) );               \
+        (p_ar)[i_pos] = elem;                                                 \
+        (i_oldsize)++;                                                        \
+    }                                                                         \
+    while( 0 )
+
+#define REMOVE_ELEM( p_ar, i_oldsize, i_pos )                                 \
+    do                                                                        \
+    {                                                                         \
+        memmove( (p_ar) + (i_pos),                                            \
+                 (p_ar) + (i_pos) + 1,                                        \
+                 ((i_oldsize) - (i_pos) - 1) * sizeof( *(p_ar) ) );           \
+        if( i_oldsize > 1 )                                                   \
+        {                                                                     \
+            (p_ar) = realloc( p_ar, ((i_oldsize) - 1) * sizeof( *(p_ar) ) );  \
+        }                                                                     \
+        else                                                                  \
+        {                                                                     \
+            free( p_ar );                                                     \
+            (p_ar) = NULL;                                                    \
+        }                                                                     \
+        (i_oldsize)--;                                                        \
+    }                                                                         \
+    while( 0 )
+
-
-/* MSB (big endian)/LSB (little endian) conversions - network order is always

src/input/input_dec.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-8 2002/10/27 16:58:12 gbazin
+9 2002/10/29 13:22:48 sam
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -285 +285 @@
-
-    /* Select a new ES */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-    /* Initialize the p_fifo structure */

src/input/input_programs.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2002 VideoLAN
-4 2002/07/31 20:56:52
+5 2002/10/29 13:22:48
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -139 +139 @@
-{
-    /* Where to add the pgrm */
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /* Add an entry to the list of program associated with the stream */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-}
-
@@ -231 +220 @@
-
-    /* Remove this program from the stream's list of programs */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-    /* Free the description of this program */
@@ -263 +236 @@
-{
-    /* Where to add the pgrm */
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /* Add an entry to the list of program associated with the stream */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-}
-
@@ -421 +386 @@
-
-    /* Remove this area from the stream's list of areas */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-    /* Free the description of this area */
@@ -484 +432 @@
-        return( NULL);
-    }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-    /* Init its values */
@@ -524 +466 @@
-    if( p_pgrm )
-    {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        p_es->p_pgrm = p_pgrm;
-    }
@@ -584 +519 @@
-            if( p_pgrm->pp_es[i_index] == p_es )
-            {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                break;
-            }
@@ -621 +542 @@
-
-    /* Remove this ES from the stream's list of ES */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    /* Free the ES */
-    free( p_es );
@@ -708 +614 @@
-        ( p_input->stream.i_selected_es_number > 0 ) )
-    {
-
-
-
+
-               ( p_input->stream.pp_selected_es[i_index] != p_es ) )
-        {
@@ -716 +620 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-            msg_Dbg( p_input, "no more selected ES" );
-( 1 )
-
-
-
-( 0 )
-
+ 1
+
+
+
+ 0
+

src/misc/messages.c

@@ -5 +5 @@
- *****************************************************************************
- * Copyright (C) 1998-2002 VideoLAN
-7 2002/10/28 16:26:44
+8 2002/10/29 13:22:48
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -138 +138 @@
-
-    /* Add subscription to the list */
-
-
-
-
-
+
-
-    p_sub->i_start = p_bank->i_start;
@@ -189 +185 @@
-
-    /* Remove this subscription */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    vlc_mutex_unlock( &p_bank->lock );

src/misc/objects.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-6 2002/10/17 13:15:31
+7 2002/10/29 13:22:48
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -187 +187 @@
-        /* Wooohaa! If *this* fails, we're in serious trouble! Anyway it's
-         * useless to try and recover anything if pp_objects gets smashed. */
-
-
-
-
-
+
+
+
+
-
-        vlc_mutex_unlock( &structure_lock );
@@ -283 +282 @@
-        free( p_this->p_libvlc->pp_objects );
-        p_this->p_libvlc->pp_objects = NULL;
+        p_this->p_libvlc->i_objects--;
-
-        vlc_mutex_destroy( &structure_lock );
@@ -296 +296 @@
-        i_index = FindIndex( p_this, p_this->p_libvlc->pp_objects,
-                             p_this->p_libvlc->i_objects );
-
-
-
-
-
-
-
-
+
+
-
-        vlc_mutex_unlock( &structure_lock );
-    }
-
-    p_this->p_libvlc->i_objects--;
-
-    vlc_mutex_destroy( &p_this->object_lock );
@@ -446 +438 @@
-
-    /* Attach the child to its parent */
-
-
-
-
+
+
-
-    /* Climb up the tree to see whether we are connected with the root */

src/misc/variables.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-0 2002/10/28 20:57:02
+1 2002/10/29 13:22:48
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -43 +43 @@
- * Local comparison functions, returns 0 if v == w, < 0 if v < w, > 0 if v > w
- *****************************************************************************/
-!= w.b_bool
+? w.b_bool ? 0 : 1 : w.b_bool ? -1 : 0
-static int CmpInt( vlc_value_t v, vlc_value_t w ) { return v.i_int == w.i_int ? 0 : v.i_int > w.i_int ? 1 : -1; }
-static int CmpString( vlc_value_t v, vlc_value_t w ) { return strcmp( v.psz_string, w.psz_string ); }
@@ -195 +195 @@
-int __var_Destroy( vlc_object_t *p_this, const char *psz_name )
-{
-
+, i
-    variable_t *p_var;
-
@@ -228 +228 @@
-    }
-
+    /* Free choice list if needed */
+    if( p_var->pp_choices )
+    {
+        for( i = 0 ; i < p_var->i_choices ; i++ )
+        {
+            p_var->pf_free( &p_var->pp_choices[i] );
+        }
+        free( p_var->pp_choices );
+    }
+
-    /* Free callbacks if needed */
-    if( p_var->p_entries )
@@ -327 +337 @@
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-            p_var->pf_dup( &p_var->pp_choices[i] );
+
-            CheckValue( p_var, &p_var->val );
-            break;
@@ -375 +369 @@
-
-            p_var->pf_free( &p_var->pp_choices[i] );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-            CheckValue( p_var, &p_var->val );
-            break;
@@ -607 +587 @@
-                       vlc_callback_t pf_callback, void *p_data )
-{
+    int i_var;
+    variable_t *p_var;
+    callback_entry_t entry;
+
+    entry.pf_callback = pf_callback;
+    entry.p_data = p_data;
+        
+    vlc_mutex_lock( &p_this->var_lock );
+
+    i_var = GetUnused( p_this, psz_name );
+    if( i_var < 0 )
+    {
+        vlc_mutex_unlock( &p_this->var_lock );
+        return i_var;
+    }
+
+    p_var = &p_this->p_vars[i_var];
+
+    INSERT_ELEM( p_var->p_entries,
+                 p_var->i_entries,
+                 p_var->i_entries,
+                 entry );
+
+    vlc_mutex_unlock( &p_this->var_lock );
+
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * var_DelCallback: remove a callback from a variable
+ *****************************************************************************
+ * pf_callback and p_data have to be given again, because different objects
+ * might have registered the same callback function.
+ *****************************************************************************/
+int __var_DelCallback( vlc_object_t *p_this, const char *psz_name,
+                       vlc_callback_t pf_callback, void *p_data )
+{
-    int i_entry, i_var;
-    variable_t *p_var;
@@ -620 +637 @@
-
-    p_var = &p_this->p_vars[i_var];
-    i_entry = p_var->i_entries++;
-
-    if( i_entry )
-    {
-        p_var->p_entries = realloc( p_var->p_entries,
-                               sizeof( callback_entry_t ) * p_var->i_entries );
-    }
-    else
-    {
-        p_var->p_entries = malloc( sizeof( callback_entry_t ) );
-    }
-
-    p_var->p_entries[ i_entry ].pf_callback = pf_callback;
-    p_var->p_entries[ i_entry ].p_data = p_data;
-        
-    vlc_mutex_unlock( &p_this->var_lock );
-
-    return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * var_DelCallback: remove a callback from a variable
- *****************************************************************************
- * pf_callback and p_data have to be given again, because different objects
- * might have registered the same callback function.
- *****************************************************************************/
-int __var_DelCallback( vlc_object_t *p_this, const char *psz_name,
-                       vlc_callback_t pf_callback, void *p_data )
-{
-    int i_entry, i_var;
-    variable_t *p_var;
-
-    vlc_mutex_lock( &p_this->var_lock );
-
-    i_var = GetUnused( p_this, psz_name );
-    if( i_var < 0 )
-    {
-        vlc_mutex_unlock( &p_this->var_lock );
-        return i_var;
-    }
-
-    p_var = &p_this->p_vars[i_var];
-
-    for( i_entry = p_var->i_entries ; i_entry-- ; )
@@ -678 +653 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    vlc_mutex_unlock( &p_this->var_lock );

src/playlist/playlist.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-4 2002/09/29 18:19:53
+5 2002/10/29 13:22:48
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -139 +139 @@
-        int i_index;
-
-        p_playlist->i_size++;
-        p_playlist->pp_items = realloc( p_playlist->pp_items,
-                                        p_playlist->i_size * sizeof(void*) );
-        if( p_playlist->pp_items == NULL )
-        {
-            msg_Err( p_playlist, "out of memory" );
-            free( p_item->psz_name );
-            free( p_item );
-            vlc_mutex_unlock( &p_playlist->object_lock );
-            return -1;
-        }
-
-        /* Additional boundary checks */
-        if( i_mode & PLAYLIST_APPEND )
@@ -161 +149 @@
-            i_pos = 0;
-        }
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-        if( p_playlist->i_index >= i_pos )
@@ -181 +168 @@
-        /* i_mode == PLAYLIST_REPLACE and 0 <= i_pos < p_playlist->i_size */
-        free( p_playlist->pp_items[i_pos]->psz_name );
+        /* XXX: what if the item is still in use? */
-        free( p_playlist->pp_items[i_pos] );
-
-
-
-
+
+
-
-    if( i_mode & PLAYLIST_GO )
@@ -219 +205 @@
-
-        free( p_playlist->pp_items[i_pos]->psz_name );
+        /* XXX: what if the item is still in use? */
-        free( p_playlist->pp_items[i_pos] );
-        /* XXX: what if the item is still in use? */
-
-        if( i_pos < p_playlist->i_index )
@@ -228 +214 @@
-
-        /* Renumber the playlist */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    }
-