* vlc_common.h: removed all cast in TAB_*. GCC doesn't like anymore

cast of lvalue. -> Don't use them anymore in C++ code.
( Don't use *(void**)&p, it won't work because of aliasing problem).

 * vlc_meta.h: don't use TAB_* as this file is included in C++ code.

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 3ef809f2c2fe258b067dd2e0df323255035ee4c9..ff844e7150ab88f03c17c419544ba8a34486c95f 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -476,13 +476,13 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
 #define TAB_APPEND( count, tab, p )             \
     if( (count) > 0 )                           \
     {                                           \
-        (void *)(tab) = realloc( tab, sizeof( void ** ) * ( (count) + 1 ) ); \
+        (tab) = realloc( tab, sizeof( void ** ) * ( (count) + 1 ) ); \
     }                                           \
     else                                        \
     {                                           \
-        (void *)(tab) = malloc( sizeof( void ** ) );    \
+        (tab) = malloc( sizeof( void ** ) );    \
     }                                           \
-    ((void**)(tab))[count] = (void*)(p);        \
+    (tab)[count] = (p);        \
     (count)++
 
 #define TAB_FIND( count, tab, p, index )        \
@@ -491,7 +491,7 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
         (index) = -1;                           \
         for( _i_ = 0; _i_ < (count); _i_++ )    \
         {                                       \
-            if( ((void**)(tab))[_i_] == (void*)(p) )  \
+            if( (tab)[_i_] == (p) )  \
             {                                   \
                 (index) = _i_;                  \
                 break;                          \

diff --git a/include/vlc_meta.h b/include/vlc_meta.h
index 9a9a47d253e3689b33e442442c1892874cf9e277..f21402c037d8bff2fdb9db83ca55fcb0896f828c 100644 (file)
--- a/include/vlc_meta.h
+++ b/include/vlc_meta.h
@@ -86,13 +86,13 @@ static inline void vlc_meta_Delete( vlc_meta_t *m )
 
 static inline void vlc_meta_Add( vlc_meta_t *m, char *name, char *value )
 {
-    int i_meta = m->i_meta;
+    m->name  = (char**)realloc( m->name, sizeof(char*) * ( m->i_meta + 1 ) );
+    m->name[m->i_meta] = strdup( name );
 
-    name = strdup( name );
-    value = strdup( value );
+    m->value = (char**)realloc( m->value, sizeof(char*) * ( m->i_meta + 1 ) );
+    m->value[m->i_meta] = strdup( value );
 
-    TAB_APPEND( m->i_meta, m->name, name );
-    TAB_APPEND( i_meta,    m->value,value );
+    m->i_meta++;
 }
 
 static inline vlc_meta_t *vlc_meta_Duplicate( vlc_meta_t *src )
@@ -106,7 +106,9 @@ static inline vlc_meta_t *vlc_meta_Duplicate( vlc_meta_t *src )
     for( i = 0; i < src->i_track; i++ )
     {
         vlc_meta_t *tk = vlc_meta_Duplicate( src->track[i] );
-        TAB_APPEND( dst->i_track, dst->track, tk );
+
+        dst->track = (vlc_meta_t**)realloc( dst->track, sizeof( vlc_meta_t* ) * (dst->i_track+1) );
+        dst->track[dst->i_track++] = tk;
     }
     return dst;
 }
@@ -118,15 +120,15 @@ static inline void vlc_meta_Merge( vlc_meta_t *dst, vlc_meta_t *src )
     {
         /* Check if dst contains the entry */
         for( j = 0; j < dst->i_meta; j++ )
-       {
-           if( !strcmp( src->name[i], dst->name[j] ) ) break;
-       }
-       if( j < dst->i_meta )
-       {
-           if( dst->value[j] ) free( dst->value[j] );
-           dst->value[j] = strdup( src->value[i] );
-       }
-       else vlc_meta_Add( dst, src->name[i], src->value[i] );
+        {
+            if( !strcmp( src->name[i], dst->name[j] ) ) break;
+        }
+        if( j < dst->i_meta )
+        {
+            if( dst->value[j] ) free( dst->value[j] );
+            dst->value[j] = strdup( src->value[i] );
+        }
+        else vlc_meta_Add( dst, src->name[i], src->value[i] );
     }
 }