X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_arrays.h;h=9757ae48c45b0187dfb09ff30e1771937f3ecf2b;hb=21ca9ddb286c5c95059dbbcb9c24364e250a3d96;hp=71e51d0bb37d156bf6711fa7dd000c7ebfad555c;hpb=8b3d8a11a0da90db879f234c27b9cd7c91d823c4;p=vlc

diff --git a/include/vlc_arrays.h b/include/vlc_arrays.h
index 71e51d0bb3..9757ae48c4 100644
--- a/include/vlc_arrays.h
+++ b/include/vlc_arrays.h
@@ -83,7 +83,7 @@
 
 #define TAB_CLEAN( count, tab )                 \
   do {                                          \
-    if( tab ) free( tab );                      \
+    free( tab );                                \
     (count)= 0;                                 \
     (tab)= NULL;                                \
   } while(0)
@@ -282,7 +282,7 @@
 
 
 /************************************************************************
- * Dynamic arrays with progressive allocation (Prefered API)
+ * Dynamic arrays with progressive allocation (Preferred API)
  ************************************************************************/
 typedef struct vlc_array_t
 {
@@ -290,11 +290,6 @@ typedef struct vlc_array_t
     void ** pp_elems;
 } vlc_array_t;
 
-static inline vlc_array_t * vlc_array_new( void )
-{
-    return (vlc_array_t *)calloc( 1, sizeof(vlc_array_t) );
-}
-
 static inline void vlc_array_init( vlc_array_t * p_array )
 {
     memset( p_array, 0, sizeof(vlc_array_t) );
@@ -306,8 +301,17 @@ 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 );
 }
@@ -427,18 +431,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;
 }
 
@@ -453,13 +460,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;
@@ -474,6 +478,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++;
@@ -512,36 +520,14 @@ __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 = 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 */
@@ -553,12 +539,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,
@@ -566,9 +551,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;
         }
     }
 }
@@ -592,14 +578,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 {