X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_arrays.h;h=7ac9290e3183ddf36ce366705a8ca9b7c8f102a0;hb=7b0dd84fff6c300cab5e0bdbf2a29fb1b3618e62;hp=4a4085c4df92b011060b5a918c323bdd52cc8115;hpb=da53016cca28d5c0d9c14801b8547c485cf878a4;p=vlc diff --git a/include/vlc_arrays.h b/include/vlc_arrays.h index 4a4085c4df..7ac9290e31 100644 --- a/include/vlc_arrays.h +++ b/include/vlc_arrays.h @@ -2,7 +2,7 @@ * 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 * Clément Stenac @@ -21,15 +21,9 @@ * 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 - /** * Simple dynamic array handling. Array is realloced at each insert/removal */ @@ -83,7 +77,7 @@ #define TAB_CLEAN( count, tab ) \ do { \ - if( tab ) free( tab ); \ + free( tab ); \ (count)= 0; \ (tab)= NULL; \ } while(0) @@ -192,7 +186,6 @@ 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) { \ @@ -220,6 +213,7 @@ } \ } +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) /* API */ #define DECL_ARRAY(type) struct { \ @@ -281,7 +275,7 @@ /************************************************************************ - * Dynamic arrays with progressive allocation (Prefered API) + * Dynamic arrays with progressive allocation (Preferred API) ************************************************************************/ typedef struct vlc_array_t { @@ -300,6 +294,22 @@ static inline void vlc_array_clear( vlc_array_t * p_array ) 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 ) @@ -308,11 +318,23 @@ vlc_array_count( vlc_array_t * p_array ) } static inline void * -vlc_array_object_at_index( vlc_array_t * p_array, int i_index ) +vlc_array_item_at_index( vlc_array_t * p_array, int i_index ) { return p_array->pp_elems[i_index]; } +static inline int +vlc_array_index_of_item( vlc_array_t * p_array, void * item ) +{ + int i; + for( i = 0; i < p_array->i_count; i++) + { + if( p_array->pp_elems[i] == item ) + return i; + } + return -1; +} + /* Write */ static inline void vlc_array_insert( vlc_array_t * p_array, void * p_elem, int i_index ) @@ -390,7 +412,6 @@ static inline void vlc_dictionary_init( vlc_dictionary_t * p_dict, int i_size ) 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 @@ -402,18 +423,21 @@ static inline void vlc_dictionary_clear( vlc_dictionary_t * p_dict ) { 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; } @@ -428,13 +452,10 @@ vlc_dictionary_value_for_key( const vlc_dictionary_t * p_dict, const char * psz_ 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; @@ -449,6 +470,10 @@ vlc_dictionary_keys_count( const vlc_dictionary_t * p_dict ) { 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++; @@ -464,16 +489,12 @@ vlc_dictionary_all_keys( const vlc_dictionary_t * p_dict ) 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; @@ -481,42 +502,19 @@ vlc_dictionary_all_keys( const vlc_dictionary_t * p_dict ) 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 */ @@ -528,12 +526,11 @@ __vlc_dictionary_insert( vlc_dictionary_t * p_dict, const char * psz_key, 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, @@ -541,9 +538,10 @@ __vlc_dictionary_insert( vlc_dictionary_t * p_dict, const char * psz_key, 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; } } } @@ -567,14 +565,6 @@ vlc_dictionary_remove_value_for_key( const vlc_dictionary_t * p_dict, const char 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 {