X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_arrays.h;h=2b57fdc3d1044e1c538d3f9b5a716413a038ae83;hb=79bf979ee9f22f83158c136181fac30b50c9b0cb;hp=f3d1acc5cd38a7e28ac8c91378cf8f862bdac35d;hpb=639eb0c5ab082e14c1fc9c32967b6d338032c2c9;p=vlc diff --git a/include/vlc_arrays.h b/include/vlc_arrays.h index f3d1acc5cd..2b57fdc3d1 100644 --- a/include/vlc_arrays.h +++ b/include/vlc_arrays.h @@ -1,25 +1,25 @@ /***************************************************************************** * vlc_arrays.h : Arrays and data structures handling ***************************************************************************** - * Copyright (C) 1999-2004 the VideoLAN team + * Copyright (C) 1999-2004 VLC authors and VideoLAN * $Id$ * * Authors: Samuel Hocevar * Clément Stenac * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #ifndef VLC_ARRAYS_H_ @@ -30,48 +30,49 @@ * This file defines functions, structures and macros for handling arrays in vlc */ +/* realloc() that never fails *if* downsizing */ +static inline void *realloc_down( void *ptr, size_t size ) +{ + void *ret = realloc( ptr, size ); + return ret ? ret : ptr; +} + /** * Simple dynamic array handling. Array is realloced at each insert/removal */ -#if defined( _MSC_VER ) && _MSC_VER < 1300 && !defined( UNDER_CE ) -# define VLCCVP (void**) /* Work-around for broken compiler */ -#else -# define VLCCVP -#endif #define INSERT_ELEM( p_ar, i_oldsize, i_pos, elem ) \ do \ { \ - if( !i_oldsize ) (p_ar) = NULL; \ - (p_ar) = VLCCVP realloc( p_ar, ((i_oldsize) + 1) * sizeof(*(p_ar)) ); \ + if( !(i_oldsize) ) (p_ar) = NULL; \ + (p_ar) = realloc( p_ar, ((i_oldsize) + 1) * sizeof(*(p_ar)) ); \ + if( !(p_ar) ) abort(); \ if( (i_oldsize) - (i_pos) ) \ { \ memmove( (p_ar) + (i_pos) + 1, (p_ar) + (i_pos), \ ((i_oldsize) - (i_pos)) * sizeof( *(p_ar) ) ); \ } \ - (p_ar)[i_pos] = elem; \ + (p_ar)[(i_pos)] = elem; \ (i_oldsize)++; \ } \ while( 0 ) -#define REMOVE_ELEM( p_ar, i_oldsize, i_pos ) \ +#define REMOVE_ELEM( p_ar, i_size, i_pos ) \ do \ { \ - if( (i_oldsize) - (i_pos) - 1 ) \ + if( (i_size) - (i_pos) - 1 ) \ { \ 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) ) ); \ + ((i_size) - (i_pos) - 1) * sizeof( *(p_ar) ) ); \ } \ + if( i_size > 1 ) \ + (p_ar) = realloc_down( p_ar, ((i_size) - 1) * sizeof( *(p_ar) ) );\ else \ { \ free( p_ar ); \ (p_ar) = NULL; \ } \ - (i_oldsize)--; \ + (i_size)--; \ } \ while( 0 ) @@ -94,41 +95,37 @@ (tab) = cast realloc( tab, sizeof( void ** ) * ( (count) + 1 ) ); \ else \ (tab) = cast malloc( sizeof( void ** ) ); \ + if( !(tab) ) abort(); \ (tab)[count] = (p); \ (count)++; \ } while(0) #define TAB_APPEND( count, tab, p ) \ TAB_APPEND_CAST( , count, tab, p ) -#define TAB_APPEND_CPP( type, count, tab, p ) \ - TAB_APPEND_CAST( (type**), count, tab, p ) #define TAB_FIND( count, tab, p, index ) \ do { \ - int _i_; \ - (index) = -1; \ - for( _i_ = 0; _i_ < (count); _i_++ ) \ + (index) = -1; \ + for( int i = 0; i < (count); i++ ) \ + if( (tab)[i] == (p) ) \ { \ - if( (tab)[_i_] == (p) ) \ - { \ - (index) = _i_; \ - break; \ - } \ + (index) = i; \ + break; \ } \ } while(0) #define TAB_REMOVE( count, tab, p ) \ do { \ - int _i_index_; \ - TAB_FIND( count, tab, p, _i_index_ ); \ - if( _i_index_ >= 0 ) \ + int i_index; \ + TAB_FIND( count, tab, p, i_index ); \ + if( i_index >= 0 ) \ { \ if( (count) > 1 ) \ { \ - memmove( ((void**)(tab) + _i_index_), \ - ((void**)(tab) + _i_index_+1), \ - ( (count) - _i_index_ - 1 ) * sizeof( void* ) );\ + memmove( ((void**)(tab) + i_index), \ + ((void**)(tab) + i_index+1), \ + ( (count) - i_index - 1 ) * sizeof( void* ) );\ } \ (count)--; \ if( (count) == 0 ) \ @@ -144,6 +141,7 @@ (tab) = cast realloc( tab, sizeof( void ** ) * ( (count) + 1 ) ); \ else \ (tab) = cast malloc( sizeof( void ** ) ); \ + if( !(tab) ) abort(); \ if( (count) - (index) > 0 ) \ memmove( (void**)(tab) + (index) + 1, \ (void**)(tab) + (index), \ @@ -190,8 +188,9 @@ /* Internal functions */ #define _ARRAY_ALLOC(array, newsize) { \ (array).i_alloc = newsize; \ - (array).p_elems = VLCCVP realloc( (array).p_elems, (array).i_alloc * \ - sizeof(*(array).p_elems) ); \ + (array).p_elems = realloc( (array).p_elems, (array).i_alloc * \ + sizeof(*(array).p_elems) ); \ + if( !(array).p_elems ) abort(); \ } #define _ARRAY_GROW1(array) { \ @@ -201,24 +200,6 @@ _ARRAY_ALLOC(array, (int)(array.i_alloc * 1.5) ) \ } -#define _ARRAY_GROW(array,additional) { \ - int i_first = (array).i_alloc; \ - while( (array).i_alloc - i_first < additional ) \ - { \ - if( (array).i_alloc < 10 ) \ - _ARRAY_ALLOC(array, 10 ) \ - else if( (array).i_alloc == (array).i_size ) \ - _ARRAY_ALLOC(array, (int)((array).i_alloc * 1.5) ) \ - else break; \ - } \ -} - -#define _ARRAY_SHRINK(array) { \ - if( (array).i_size > 10 && (array).i_size < (int)((array).i_alloc / 1.5) ) { \ - _ARRAY_ALLOC(array, (array).i_size + 5); \ - } \ -} - #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) /* API */ @@ -262,6 +243,12 @@ (array).i_size++; \ } while(0) +#define _ARRAY_SHRINK(array) { \ + if( (array).i_size > 10 && (array).i_size < (int)((array).i_alloc / 1.5) ) { \ + _ARRAY_ALLOC(array, (array).i_size + 5); \ + } \ +} + #define ARRAY_REMOVE(array,pos) \ do { \ if( (array).i_size - (pos) - 1 ) \ @@ -405,30 +392,31 @@ static inline uint64_t DictHash( const char *psz_string, int hashsize ) return i_hash % hashsize; } -struct vlc_dictionary_entry_t +typedef struct vlc_dictionary_entry_t { char * psz_key; void * p_value; struct vlc_dictionary_entry_t * p_next; -}; +} vlc_dictionary_entry_t; typedef struct vlc_dictionary_t { int i_size; - struct vlc_dictionary_entry_t ** p_entries; + vlc_dictionary_entry_t ** p_entries; } vlc_dictionary_t; static void * const kVLCDictionaryNotFound = NULL; static inline void vlc_dictionary_init( vlc_dictionary_t * p_dict, int i_size ) { + p_dict->p_entries = NULL; + if( i_size > 0 ) { - p_dict->p_entries = (struct vlc_dictionary_entry_t **)malloc(sizeof(struct vlc_dictionary_entry_t *) * i_size); - memset( p_dict->p_entries, 0, sizeof(struct vlc_dictionary_entry_t *) * i_size ); + p_dict->p_entries = (vlc_dictionary_entry_t **)calloc( i_size, sizeof(*p_dict->p_entries) ); + if( !p_dict->p_entries ) + i_size = 0; } - else - p_dict->p_entries = NULL; p_dict->i_size = i_size; } @@ -436,12 +424,11 @@ static inline void vlc_dictionary_clear( vlc_dictionary_t * p_dict, void ( * pf_free )( void * p_data, void * p_obj ), void * p_obj ) { - int i; - struct vlc_dictionary_entry_t * p_current, * p_next; if( p_dict->p_entries ) { - for( i = 0; i < p_dict->i_size; i++ ) + for( int i = 0; i < p_dict->i_size; i++ ) { + vlc_dictionary_entry_t * p_current, * p_next; p_current = p_dict->p_entries[i]; while( p_current ) { @@ -459,7 +446,15 @@ static inline void vlc_dictionary_clear( vlc_dictionary_t * p_dict, p_dict->i_size = 0; } +static inline int +vlc_dictionary_has_key( const vlc_dictionary_t * p_dict, const char * psz_key ) +{ + if( !p_dict->p_entries ) + return 0; + int i_pos = DictHash( psz_key, p_dict->i_size ); + return p_dict->p_entries[i_pos] != NULL; +} static inline void * vlc_dictionary_value_for_key( const vlc_dictionary_t * p_dict, const char * psz_key ) @@ -468,7 +463,7 @@ vlc_dictionary_value_for_key( const vlc_dictionary_t * p_dict, const char * psz_ return kVLCDictionaryNotFound; int i_pos = DictHash( psz_key, p_dict->i_size ); - struct vlc_dictionary_entry_t * p_entry = p_dict->p_entries[i_pos]; + vlc_dictionary_entry_t * p_entry = p_dict->p_entries[i_pos]; if( !p_entry ) return kVLCDictionaryNotFound; @@ -486,7 +481,7 @@ vlc_dictionary_value_for_key( const vlc_dictionary_t * p_dict, const char * psz_ static inline int vlc_dictionary_keys_count( const vlc_dictionary_t * p_dict ) { - struct vlc_dictionary_entry_t * p_entry; + vlc_dictionary_entry_t * p_entry; int i, count = 0; if( !p_dict->p_entries ) @@ -502,11 +497,13 @@ vlc_dictionary_keys_count( const vlc_dictionary_t * p_dict ) static inline char ** vlc_dictionary_all_keys( const vlc_dictionary_t * p_dict ) { - struct vlc_dictionary_entry_t * p_entry; + vlc_dictionary_entry_t * p_entry; char ** ppsz_ret; int i, count = vlc_dictionary_keys_count( p_dict ); ppsz_ret = (char**)malloc(sizeof(char *) * (count + 1)); + if( unlikely(!ppsz_ret) ) + return NULL; count = 0; for( i = 0; i < p_dict->i_size; i++ ) @@ -526,9 +523,9 @@ __vlc_dictionary_insert( vlc_dictionary_t * p_dict, const char * psz_key, vlc_dictionary_init( p_dict, 1 ); int i_pos = DictHash( psz_key, p_dict->i_size ); - struct vlc_dictionary_entry_t * p_entry; + vlc_dictionary_entry_t * p_entry; - p_entry = (struct vlc_dictionary_entry_t *)malloc(sizeof(struct vlc_dictionary_entry_t)); + p_entry = (vlc_dictionary_entry_t *)malloc(sizeof(*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]; @@ -537,7 +534,8 @@ __vlc_dictionary_insert( vlc_dictionary_t * p_dict, const char * psz_key, { /* Count how many items there was */ int count; - for( count = 1; p_entry->p_next; count++ ) p_entry = p_entry->p_next; + for( count = 1; p_entry->p_next; count++ ) + p_entry = p_entry->p_next; if( count > 3 ) /* XXX: this need tuning */ { /* Here it starts to be not good, rebuild a bigger dictionary */ @@ -552,7 +550,7 @@ __vlc_dictionary_insert( vlc_dictionary_t * p_dict, const char * psz_key, { __vlc_dictionary_insert( &new_dict, p_entry->psz_key, p_entry->p_value, - 0 /* To avoid multiple rebuild loop */); + false /* To avoid multiple rebuild loop */); p_entry = p_entry->p_next; } } @@ -567,7 +565,7 @@ __vlc_dictionary_insert( vlc_dictionary_t * p_dict, const char * psz_key, static inline void vlc_dictionary_insert( vlc_dictionary_t * p_dict, const char * psz_key, void * p_value ) { - __vlc_dictionary_insert( p_dict, psz_key, p_value, 1 ); + __vlc_dictionary_insert( p_dict, psz_key, p_value, true ); } static inline void @@ -579,8 +577,8 @@ vlc_dictionary_remove_value_for_key( const vlc_dictionary_t * p_dict, const char return; int i_pos = DictHash( psz_key, p_dict->i_size ); - struct vlc_dictionary_entry_t * p_entry = p_dict->p_entries[i_pos]; - struct vlc_dictionary_entry_t * p_prev; + vlc_dictionary_entry_t * p_entry = p_dict->p_entries[i_pos]; + vlc_dictionary_entry_t * p_prev; if( !p_entry ) return; /* Not found, nothing to do */ @@ -607,4 +605,20 @@ vlc_dictionary_remove_value_for_key( const vlc_dictionary_t * p_dict, const char /* No key was found */ } +#ifdef __cplusplus +// C++ helpers +template +void vlc_delete_all( T &container ) +{ + typename T::iterator it = container.begin(); + while ( it != container.end() ) + { + delete *it; + ++it; + } + container.clear(); +} + +#endif + #endif