Skip to content

V
vlc-2-2
Commit 319e629d authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* ./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.
parent 1063d36a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 168 additions and 343 deletions
include/vlc_common.h
View file @ 319e629d
......@@ -3,7 +3,7 @@
* Collection of useful common types and macros definitions
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: vlc_common.h,v 1.32 2002/10/25 09:21:09 sam Exp $
* $Id: vlc_common.h,v 1.33 2002/10/29 13:22:47 sam Exp $
*
* Authors: Samuel Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr>
......@@ -346,6 +346,46 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */
# 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
* MSB, and should be used for both network communications and files. Note that
* byte orders other than little and big endians are not supported, but only
......
src/input/input_dec.c
View file @ 319e629d
......@@ -2,7 +2,7 @@
* input_dec.c: Functions for the management of decoders
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: input_dec.c,v 1.48 2002/10/27 16:58:12 gbazin Exp $
* $Id: input_dec.c,v 1.49 2002/10/29 13:22:48 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -284,20 +284,10 @@ static decoder_fifo_t * CreateDecoderFifo( input_thread_t * p_input,
}
/* Select a new ES */
p_input->stream.i_selected_es_number++;
p_input->stream.pp_selected_es = realloc(
p_input->stream.pp_selected_es,
p_input->stream.i_selected_es_number
* sizeof(es_descriptor_t *) );
if( p_input->stream.pp_selected_es == NULL )
{
msg_Err( p_input, "out of memory" );
vlc_object_destroy( p_fifo );
return NULL;
}
p_input->stream.pp_selected_es[p_input->stream.i_selected_es_number - 1]
= p_es;
INSERT_ELEM( p_input->stream.pp_selected_es,
p_input->stream.i_selected_es_number,
p_input->stream.i_selected_es_number,
p_es );
/* Initialize the p_fifo structure */
vlc_mutex_init( p_input, &p_fifo->data_lock );
......
src/input/input_programs.c
View file @ 319e629d
This diff is collapsed.
src/misc/messages.c
View file @ 319e629d
......@@ -4,7 +4,7 @@
* modules, especially intf modules. See config.h for output configuration.
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
* $Id: messages.c,v 1.17 2002/10/28 16:26:44 sam Exp $
* $Id: messages.c,v 1.18 2002/10/29 13:22:48 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -137,11 +137,7 @@ msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this )
vlc_mutex_lock( &p_bank->lock );
/* Add subscription to the list */
p_bank->i_sub++;
p_bank->pp_sub = realloc( p_bank->pp_sub,
p_bank->i_sub * sizeof( msg_subscription_t* ) );
p_bank->pp_sub[ p_bank->i_sub - 1 ] = p_sub;
INSERT_ELEM( p_bank->pp_sub, p_bank->i_sub, p_bank->i_sub, p_sub );
p_sub->i_start = p_bank->i_start;
p_sub->pi_stop = &p_bank->i_stop;
......@@ -188,23 +184,7 @@ void __msg_Unsubscribe( vlc_object_t *p_this, msg_subscription_t *p_sub )
}
/* Remove this subscription */
for( ; i_index < (p_bank->i_sub - 1); i_index++ )
{
p_bank->pp_sub[ i_index ] = p_bank->pp_sub[ i_index+1 ];
}
p_bank->i_sub--;
if( p_bank->i_sub )
{
p_bank->pp_sub = realloc( p_bank->pp_sub, p_bank->i_sub
* sizeof( msg_subscription_t* ) );
}
else
{
free( p_bank->pp_sub );
p_bank->pp_sub = NULL;
}
REMOVE_ELEM( p_bank->pp_sub, p_bank->i_sub, i_index );
vlc_mutex_unlock( &p_bank->lock );
}
......
src/misc/objects.c
View file @ 319e629d
......@@ -2,7 +2,7 @@
* objects.c: vlc_object_t handling
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: objects.c,v 1.26 2002/10/17 13:15:31 sam Exp $
* $Id: objects.c,v 1.27 2002/10/29 13:22:48 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -186,11 +186,10 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
/* Wooohaa! If *this* fails, we're in serious trouble! Anyway it's
* useless to try and recover anything if pp_objects gets smashed. */
p_new->p_libvlc->i_objects++;
p_new->p_libvlc->pp_objects =
realloc( p_new->p_libvlc->pp_objects,
p_new->p_libvlc->i_objects * sizeof(vlc_object_t *) );
p_new->p_libvlc->pp_objects[ p_new->p_libvlc->i_objects - 1 ] = p_new;
INSERT_ELEM( p_new->p_libvlc->pp_objects,
p_new->p_libvlc->i_objects,
p_new->p_libvlc->i_objects,
p_new );
vlc_mutex_unlock( &structure_lock );
}
......@@ -282,6 +281,7 @@ void __vlc_object_destroy( vlc_object_t *p_this )
/* We are the root object ... no need to lock. */
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 );
}
......@@ -295,20 +295,12 @@ void __vlc_object_destroy( vlc_object_t *p_this )
* useless to try and recover anything if pp_objects gets smashed. */
i_index = FindIndex( p_this, p_this->p_libvlc->pp_objects,
p_this->p_libvlc->i_objects );
memmove( p_this->p_libvlc->pp_objects + i_index,
p_this->p_libvlc->pp_objects + i_index + 1,
(p_this->p_libvlc->i_objects - i_index - 1)
* sizeof( vlc_object_t *) );
p_this->p_libvlc->pp_objects =
realloc( p_this->p_libvlc->pp_objects,
(p_this->p_libvlc->i_objects - 1) * sizeof(vlc_object_t *) );
REMOVE_ELEM( p_this->p_libvlc->pp_objects,
p_this->p_libvlc->i_objects, i_index );
vlc_mutex_unlock( &structure_lock );
}
p_this->p_libvlc->i_objects--;
vlc_mutex_destroy( &p_this->object_lock );
vlc_cond_destroy( &p_this->object_wait );
......@@ -445,10 +437,8 @@ void __vlc_object_attach( vlc_object_t *p_this, vlc_object_t *p_parent )
p_this->p_parent = p_parent;
/* Attach the child to its parent */
p_parent->i_children++;
p_parent->pp_children = (vlc_object_t **)realloc( p_parent->pp_children,
p_parent->i_children * sizeof(vlc_object_t *) );
p_parent->pp_children[p_parent->i_children - 1] = p_this;
INSERT_ELEM( p_parent->pp_children, p_parent->i_children,
p_parent->i_children, p_this );
/* Climb up the tree to see whether we are connected with the root */
if( p_parent->b_attached )
......
src/misc/variables.c
View file @ 319e629d
......@@ -2,7 +2,7 @@
* variables.c: routines for object variables handling
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: variables.c,v 1.10 2002/10/28 20:57:02 sam Exp $
* $Id: variables.c,v 1.11 2002/10/29 13:22:48 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -42,7 +42,7 @@ struct callback_entry_t
/*****************************************************************************
* Local comparison functions, returns 0 if v == w, < 0 if v < w, > 0 if v > w
*****************************************************************************/
static int CmpBool( vlc_value_t v, vlc_value_t w ) { return v.b_bool != w.b_bool; }
static int CmpBool( vlc_value_t v, vlc_value_t w ) { return v.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 ); }
static int CmpFloat( vlc_value_t v, vlc_value_t w ) { return v.f_float == w.f_float ? 0 : v.f_float > w.f_float ? 1 : -1; }
......@@ -194,7 +194,7 @@ int __var_Create( vlc_object_t *p_this, const char *psz_name, int i_type )
*****************************************************************************/
int __var_Destroy( vlc_object_t *p_this, const char *psz_name )
{
int i_var;
int i_var, i;
variable_t *p_var;
vlc_mutex_lock( &p_this->var_lock );
......@@ -227,6 +227,16 @@ int __var_Destroy( vlc_object_t *p_this, const char *psz_name )
break;
}
/* 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 )
{
......@@ -326,25 +336,9 @@ int __var_Change( vlc_object_t *p_this, const char *psz_name,
p_var->i_default++;
}
if( p_var->i_choices )
{
p_var->pp_choices = realloc( p_var->pp_choices,
(p_var->i_choices + 1)
* sizeof(vlc_value_t) );
}
else
{
p_var->pp_choices = malloc( (p_var->i_choices + 1)
* sizeof(vlc_value_t) );
}
memmove( p_var->pp_choices + i + 1,
p_var->pp_choices + i,
(p_var->i_choices - i) * sizeof(vlc_value_t) );
p_var->i_choices++;
p_var->pp_choices[i] = *p_val;
INSERT_ELEM( p_var->pp_choices, p_var->i_choices, i, *p_val );
p_var->pf_dup( &p_var->pp_choices[i] );
CheckValue( p_var, &p_var->val );
break;
case VLC_VAR_DELCHOICE:
......@@ -374,22 +368,8 @@ int __var_Change( vlc_object_t *p_this, const char *psz_name,
}
p_var->pf_free( &p_var->pp_choices[i] );
REMOVE_ELEM( p_var->pp_choices, p_var->i_choices, i );
memmove( p_var->pp_choices + i,
p_var->pp_choices + i + 1,
(p_var->i_choices - i - 1) * sizeof(vlc_value_t) );
p_var->i_choices--;
if( p_var->i_choices )
{
p_var->pp_choices = realloc( p_var->pp_choices,
p_var->i_choices
* sizeof(vlc_value_t) );
}
else
{
free( p_var->pp_choices );
}
CheckValue( p_var, &p_var->val );
break;
case VLC_VAR_SETDEFAULT:
......@@ -606,9 +586,13 @@ int __var_Get( vlc_object_t *p_this, const char *psz_name, vlc_value_t *p_val )
int __var_AddCallback( vlc_object_t *p_this, const char *psz_name,
vlc_callback_t pf_callback, void *p_data )
{
int i_entry, i_var;
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 );
......@@ -619,21 +603,12 @@ int __var_AddCallback( vlc_object_t *p_this, const char *psz_name,
}
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 ) );
}
INSERT_ELEM( p_var->p_entries,
p_var->i_entries,
p_var->i_entries,
entry );
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;
......@@ -677,22 +652,7 @@ int __var_DelCallback( vlc_object_t *p_this, const char *psz_name,
return VLC_EGENERIC;
}
p_var->i_entries--;
memmove( p_var->p_entries + i_entry,
p_var->p_entries + i_entry + 1,
sizeof( callback_entry_t ) * ( p_var->i_entries - i_entry ) );
if( p_var->i_entries )
{
p_var->p_entries = realloc( p_var->p_entries,
sizeof( callback_entry_t ) * ( p_var->i_entries ) );
}
else
{
free( p_var->p_entries );
p_var->p_entries = NULL;
}
REMOVE_ELEM( p_var->p_entries, p_var->i_entries, i_entry );
vlc_mutex_unlock( &p_this->var_lock );
......
src/playlist/playlist.c
View file @ 319e629d
......@@ -2,7 +2,7 @@
* playlist.c : Playlist management functions
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: playlist.c,v 1.14 2002/09/29 18:19:53 sam Exp $
* $Id: playlist.c,v 1.15 2002/10/29 13:22:48 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -138,18 +138,6 @@ int playlist_Add( playlist_t *p_playlist, const char * psz_target,
{
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 )
{
......@@ -160,16 +148,15 @@ int playlist_Add( playlist_t *p_playlist, const char * psz_target,
{
i_pos = 0;
}
else if( i_pos > p_playlist->i_size - 1 )
else if( i_pos > p_playlist->i_size )
{
i_pos = p_playlist->i_size - 1;
i_pos = p_playlist->i_size;
}
/* Now we know exactly where it goes. Just renumber the playlist */
for( i_index = p_playlist->i_size - 1; i_index > i_pos ; i_index-- )
{
p_playlist->pp_items[i_index] = p_playlist->pp_items[i_index - 1];
}
INSERT_ELEM( p_playlist->pp_items,
p_playlist->i_size,
i_pos,
p_item );
if( p_playlist->i_index >= i_pos )
{
......@@ -180,12 +167,11 @@ int playlist_Add( playlist_t *p_playlist, const char * psz_target,
{
/* i_mode == PLAYLIST_REPLACE and 0 <= i_pos < p_playlist->i_size */
free( p_playlist->pp_items[i_pos]->psz_name );
free( p_playlist->pp_items[i_pos] );
/* XXX: what if the item is still in use? */
free( p_playlist->pp_items[i_pos] );
p_playlist->pp_items[i_pos] = p_item;
}
p_playlist->pp_items[i_pos] = p_item;
if( i_mode & PLAYLIST_GO )
{
p_playlist->i_index = i_pos;
......@@ -218,8 +204,8 @@ int playlist_Delete( playlist_t * p_playlist, int i_pos )
p_playlist->pp_items[i_pos]->psz_name );
free( p_playlist->pp_items[i_pos]->psz_name );
free( p_playlist->pp_items[i_pos] );
/* XXX: what if the item is still in use? */
free( p_playlist->pp_items[i_pos] );
if( i_pos < p_playlist->i_index )
{
......@@ -227,22 +213,9 @@ int playlist_Delete( playlist_t * p_playlist, int i_pos )
}
/* Renumber the playlist */
for( i_index = i_pos + 1; i_index < p_playlist->i_size; i_index++ )
{
p_playlist->pp_items[i_index - 1] = p_playlist->pp_items[i_index];
}
p_playlist->i_size--;
if( p_playlist->i_size )
{
p_playlist->pp_items = realloc( p_playlist->pp_items,
p_playlist->i_size * sizeof(void*) );
}
else
{
free( p_playlist->pp_items );
p_playlist->pp_items = NULL;
}
REMOVE_ELEM( p_playlist->pp_items,
p_playlist->i_size,
i_pos );
}
vlc_mutex_unlock( &p_playlist->object_lock );
......
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