Fix compiler warnings about signed - unsigned comparissons and wrong datatypes.
authorJean-Paul Saman <jpsaman@videolan.org>
Tue, 29 Aug 2006 08:50:20 +0000 (08:50 +0000)
committerJean-Paul Saman <jpsaman@videolan.org>
Tue, 29 Aug 2006 08:50:20 +0000 (08:50 +0000)
modules/demux/avi/avi.c
modules/demux/mjpeg.c
modules/demux/mp4/drms.c
modules/demux/mp4/mp4.c
modules/demux/playlist/xspf.h

index 162674f..bdf0d5d 100644 (file)
@@ -1837,7 +1837,7 @@ vlc_fourcc_t AVI_FourccGetCodec( unsigned int i_cat, vlc_fourcc_t i_codec )
  *
  ****************************************************************************/
 static void AVI_ParseStreamHeader( vlc_fourcc_t i_id,
-                                   int *pi_number, int *pi_type )
+                                   unsigned int *pi_number, unsigned int *pi_type )
 {
 #define SET_PTR( p, v ) if( p ) *(p) = (v);
     int c1, c2;
index f614da2..cf15593 100644 (file)
@@ -157,7 +157,7 @@ static char* GetLine( demux_t *p_demux, int *p_pos )
         msg_Err( p_demux, "out of memory" );
         return NULL;
     }
-    strncpy ( p_line, p_buf, i );
+    strncpy ( p_line, (char*)p_buf, i );
     p_line[i] = '\0';
 //    msg_Dbg( p_demux, "i = %d, pos = %d, %s", i, *p_pos, p_line );
     return p_line;
index 0da6242..e035cca 100644 (file)
@@ -1522,14 +1522,14 @@ static int GetSystemKey( uint32_t *p_sys_key, vlc_bool_t b_ipod )
     /* Combine our system info hash with additional secret data. The resulting
      * MD5 hash will be our system key. */
     InitMD5( &md5 );
-    AddMD5( &md5, p_secret5, 8 );
+    AddMD5( &md5, (uint8_t*)p_secret5, 8 );
 
     if( !b_ipod )
     {
         AddMD5( &md5, (uint8_t *)p_system_hash, 6 );
         AddMD5( &md5, (uint8_t *)p_system_hash, 6 );
         AddMD5( &md5, (uint8_t *)p_system_hash, 6 );
-        AddMD5( &md5, p_secret6, 8 );
+        AddMD5( &md5, (uint8_t *)p_secret6, 8 );
     }
     else
     {
index ac0f39a..84300fa 100644 (file)
@@ -651,7 +651,7 @@ static int Demux( demux_t *p_demux )
                             p_block->i_buffer = i_size + 1;
 
                             /* convert \r -> \n */
-                            while( ( p = strchr( p_block->p_buffer, '\r' ) ) )
+                            while( ( p = strchr((char *) p_block->p_buffer, '\r' ) ) )
                             {
                                 *p = '\n';
                             }
index 04dbbbc..374153f 100644 (file)
@@ -48,7 +48,6 @@ static vlc_bool_t parse_extension_node COMPLEX_INTERFACE;
 static vlc_bool_t parse_extitem_node COMPLEX_INTERFACE;
 static vlc_bool_t set_item_info SIMPLE_INTERFACE;
 static vlc_bool_t skip_element COMPLEX_INTERFACE;
-static vlc_bool_t insert_new_item( playlist_t *, playlist_item_t *, playlist_item_t **, char *);
 
 /* datatypes */
 typedef struct