* vlc_arrays.h : Arrays and data structures handling
*****************************************************************************
* Copyright (C) 1999-2004 the VideoLAN team
- * $Id: vlc_playlist.h 17108 2006-10-15 15:28:34Z zorglub $
+ * $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Clément Stenac <zorglub@videolan.org>
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/
-#if !defined( __LIBVLC__ )
- #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
-
#ifndef _VLC_ARRAYS_H_
#define _VLC_ARRAYS_H_
-#include <assert.h>
-
/**
* Simple dynamic array handling. Array is realloced at each insert/removal
*/
#define TAB_CLEAN( count, tab ) \
do { \
- if( tab ) free( tab ); \
+ free( tab ); \
(count)= 0; \
(tab)= NULL; \
} while(0)
array.i_alloc = newsize; \
array.p_elems = VLCCVP realloc( array.p_elems, array.i_alloc * \
sizeof(*array.p_elems) ); \
- assert(array.p_elems); \
}
#define _ARRAY_GROW1(array) { \
/************************************************************************
- * Dynamic arrays with progressive allocation (Prefered API)
+ * Dynamic arrays with progressive allocation (Preferred API)
************************************************************************/
typedef struct vlc_array_t
{
memset( p_array, 0, sizeof(vlc_array_t) );
}
+static inline vlc_array_t * vlc_array_new( void )
+{
+ vlc_array_t * ret = (vlc_array_t *)malloc( sizeof(vlc_array_t) );
+ if( ret ) vlc_array_init( ret );
+ return ret;
+}
+
+static inline void vlc_array_destroy( vlc_array_t * p_array )
+{
+ if( !p_array )
+ return;
+ vlc_array_clear( p_array );
+ free( p_array );
+}
+
+
/* Read */
static inline int
vlc_array_count( vlc_array_t * p_array )
if( i_size > 0 )
{
p_dict->p_entries = (struct vlc_dictionary_entry_t **)malloc(sizeof(struct vlc_dictionary_entry_t *) * i_size);
- assert( p_dict->p_entries );
memset( p_dict->p_entries, 0, sizeof(struct vlc_dictionary_entry_t *) * i_size );
}
else
{
int i;
struct vlc_dictionary_entry_t * p_current, * p_next;
- for( i = 0; i < p_dict->i_size; i++ )
+ if( p_dict->p_entries )
{
- p_current = p_dict->p_entries[i];
- while( p_current )
+ for( i = 0; i < p_dict->i_size; i++ )
{
- p_next = p_dict->p_entries[i]->p_next;
- free( p_dict->p_entries[i]->psz_key );
- free( p_current );
- p_current = p_next;
+ p_current = p_dict->p_entries[i];
+ while( p_current )
+ {
+ p_next = p_current->p_next;
+ free( p_current->psz_key );
+ free( p_current );
+ p_current = p_next;
+ }
}
+ free( p_dict->p_entries );
}
- free( p_dict->p_entries );
p_dict->i_size = 0;
}
int i_pos = DictHash( psz_key, p_dict->i_size );
struct vlc_dictionary_entry_t * p_entry = p_dict->p_entries[i_pos];
- if( p_entry && !p_entry->p_next )
- return p_entry->p_value;
-
if( !p_entry )
return kVLCDictionaryNotFound;
- /* Hash collision */
+ /* Make sure we return the right item. (Hash collision) */
do {
if( !strcmp( psz_key, p_entry->psz_key ) )
return p_entry->p_value;
{
struct vlc_dictionary_entry_t * p_entry;
int i, count = 0;
+
+ if( !p_dict->p_entries )
+ return 0;
+
for( i = 0; i < p_dict->i_size; i++ )
{
for( p_entry = p_dict->p_entries[i]; p_entry; p_entry = p_entry->p_next ) count++;
int i, count = vlc_dictionary_keys_count( p_dict );
ppsz_ret = (char**)malloc(sizeof(char *) * (count + 1));
- assert( ppsz_ret );
-
+
count = 0;
for( i = 0; i < p_dict->i_size; i++ )
{
for( p_entry = p_dict->p_entries[i]; p_entry; p_entry = p_entry->p_next )
- {
ppsz_ret[count++] = strdup( p_entry->psz_key );
- assert( ppsz_ret );
- }
}
ppsz_ret[count] = NULL;
return ppsz_ret;
static inline void
__vlc_dictionary_insert( vlc_dictionary_t * p_dict, const char * psz_key,
- void * p_value, vlc_bool_t rebuild )
+ void * p_value, bool rebuild )
{
if( !p_dict->p_entries )
vlc_dictionary_init( p_dict, 1 );
int i_pos = DictHash( psz_key, p_dict->i_size );
- struct vlc_dictionary_entry_t * p_entry = p_dict->p_entries[i_pos];
-
- if( !p_entry )
- {
- p_entry = p_dict->p_entries[i_pos] = (struct vlc_dictionary_entry_t *)malloc(
- sizeof(struct vlc_dictionary_entry_t));
- assert( p_entry );
-
- p_entry->psz_key = strdup( psz_key );
- assert( p_entry->psz_key );
- p_entry->p_value = p_value;
- p_dict->p_entries[i_pos]->p_next = NULL;
- return;
- }
- if( p_entry->p_value == kVLCDictionaryNotFound )
- {
- /* This one is fine, just high jack */
- p_entry->psz_key = strdup( psz_key );
- p_entry->p_value = p_value;
- return;
- }
+ struct vlc_dictionary_entry_t * p_entry;
- /* Hash collision here */
p_entry = (struct vlc_dictionary_entry_t *)malloc(sizeof(struct vlc_dictionary_entry_t));
- assert( p_entry );
p_entry->psz_key = strdup( psz_key );
p_entry->p_value = p_value;
p_entry->p_next = p_dict->p_entries[i_pos];
p_dict->p_entries[i_pos] = p_entry;
-
if( rebuild )
{
/* Count how many items there was */
struct vlc_dictionary_t new_dict;
int i_new_size = ( (p_dict->i_size+2) * 3) / 2; /* XXX: this need tuning */
int i;
-
vlc_dictionary_init( &new_dict, i_new_size );
for( i = 0; i < p_dict->i_size; i++ )
{
p_entry = p_dict->p_entries[i];
- while( p_entry );
+ while( p_entry )
{
__vlc_dictionary_insert( &new_dict, p_entry->psz_key,
p_entry->p_value,
p_entry = p_entry->p_next;
}
}
+
vlc_dictionary_clear( p_dict );
p_dict->i_size = new_dict.i_size;
- p_dict->p_entries= new_dict.p_entries;
+ p_dict->p_entries = new_dict.p_entries;
}
}
}
if( !p_entry )
return; /* Not found, nothing to do */
- if( !p_entry->p_next )
- {
- free( p_entry->psz_key );
- free( p_entry );
- p_dict->p_entries[i_pos] = NULL;
- return;
- }
-
/* Hash collision */
p_prev = NULL;
do {
projects / vlc / blobdiff