static inline void vlc_dictionary_init( vlc_dictionary_t * p_dict, int i_size )
{
- p_dict->p_entries = 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 );
+ 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
+ p_dict->p_entries = NULL;
p_dict->i_size = i_size;
}
static inline void *
vlc_dictionary_value_for_key( const vlc_dictionary_t * p_dict, const char * psz_key )
{
+ if( !p_dict->p_entries )
+ 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];
if( !p_entry )
return kVLCDictionaryNotFound;
- /* Hash collision */
+ /* Hash collision */
do {
if( !strcmp( psz_key, p_entry->psz_key ) )
return p_entry->p_value;
p_entry = p_entry->p_next;
} while( p_entry );
+ return kVLCDictionaryNotFound;
}
static inline int
vlc_dictionary_keys_count( const vlc_dictionary_t * p_dict )
{
- struct vlc_dictionary_entry_t * p_entry;
+ struct vlc_dictionary_entry_t * p_entry;
int i, count = 0;
for( i = 0; i < p_dict->i_size; i++ )
{
char ** ppsz_ret;
int i, count = vlc_dictionary_keys_count( p_dict );
- ppsz_ret = malloc(sizeof(char *) * (count + 1));
+ ppsz_ret = (char**)malloc(sizeof(char *) * (count + 1));
assert( ppsz_ret );
-
+
count = 0;
for( i = 0; i < p_dict->i_size; i++ )
{
__vlc_dictionary_insert( vlc_dictionary_t * p_dict, const char * psz_key,
void * p_value, vlc_bool_t 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] = malloc(sizeof(struct vlc_dictionary_entry_t));
+ 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 );
}
/* Hash collision here */
- p_entry = malloc(sizeof(struct vlc_dictionary_entry_t));
+ 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;
{
/* Here it starts to be not good, rebuild a bigger dictionary */
struct vlc_dictionary_t new_dict;
- int i_new_size = ( p_dict->i_size * 3) / 2; /* XXX: this need tuning */
+ 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 );
p_entry->p_value,
0 /* To avoid multiple rebuild loop */);
p_entry = p_entry->p_next;
- }
+ }
}
vlc_dictionary_clear( p_dict );
p_dict->i_size = new_dict.i_size;
static inline void
vlc_dictionary_remove_value_for_key( const vlc_dictionary_t * p_dict, const char * psz_key )
{
+ if( !p_dict->p_entries )
+ 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;
free( p_entry->psz_key );
free( p_entry );
p_dict->p_entries[i_pos] = NULL;
+ return;
}
/* Hash collision */