Commit ade615bf authored by Sam Hocevar's avatar Sam Hocevar

* ./configure.ac.in: removed -W in favour of -Wtraditional.

  * ALL: a bunch of additional warning fixes.
parent 94cc398e
......@@ -460,16 +460,16 @@ fi
# fi
#done
AC_CACHE_CHECK([if \$CC accepts -W],
[ac_cv_c_W],
[CFLAGS="-W ${CFLAGS_save}"
AC_TRY_COMPILE([],,ac_cv_c_W=yes, ac_cv_c_W=no)])
AC_CACHE_CHECK([if \$CC accepts -Wall],
[ac_cv_c_Wall],
[CFLAGS="-Wall ${CFLAGS_save}"
AC_TRY_COMPILE([],,ac_cv_c_Wall=yes, ac_cv_c_Wall=no)])
AC_CACHE_CHECK([if \$CC accepts -Wtraditional],
[ac_cv_c_Wtraditional],
[CFLAGS="-Wtraditional ${CFLAGS_save}"
AC_TRY_COMPILE([],,ac_cv_c_Wtraditional=yes, ac_cv_c_Wtraditional=no)])
AC_CACHE_CHECK([if \$CC accepts -Wconversion],
[ac_cv_c_Wconversion],
[CFLAGS="-Wconversion ${CFLAGS_save}"
......@@ -495,17 +495,18 @@ AC_CACHE_CHECK([if \$CC accepts -Winline],
[CFLAGS="-Winline ${CFLAGS_save}"
AC_TRY_COMPILE([],,ac_cv_c_Winline=yes, ac_cv_c_Winline=no)])
if test "x${ac_cv_c_W}" != "xno"; then
CFLAGS_save="-W ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="-W ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="-W ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
fi
if test "x${ac_cv_c_Wall}" != "xno"; then
CFLAGS_save="-Wall ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="-Wall ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="-Wall ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
fi
if test "x${ac_cv_c_Wtraditional}" != "xno"; then
CFLAGS_save="-Wtraditional ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="-Wtraditional ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="-Wtraditional ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
fi
if test "x${ac_cv_c_Wunreachable_code}" != "xno"; then
CFLAGS_save="-Wunreachable-code ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="-Wunreachable-code ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
......
......@@ -4,7 +4,7 @@
* control the pace of reading.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: input_ext-intf.h,v 1.79 2002/12/06 10:10:40 sam Exp $
* $Id: input_ext-intf.h,v 1.80 2002/12/06 16:34:03 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -61,7 +61,7 @@ struct es_descriptor_t
/* PES parser information */
pes_packet_t * p_pes; /* Current PES */
int i_pes_real_size; /* as indicated by the header */
unsigned int i_pes_real_size; /* as indicated by the header */
/* Decoder information */
decoder_fifo_t * p_decoder_fifo;
......@@ -114,7 +114,7 @@ struct pgrm_descriptor_t
/* Demultiplexer data */
pgrm_sys_t * p_demux_data;
int i_es_number; /* size of the following array */
unsigned int i_es_number; /* size of the following array */
es_descriptor_t ** pp_es; /* array of pointers to ES */
};
......@@ -131,7 +131,7 @@ struct pgrm_descriptor_t
struct input_area_t
{
/* selected area attributes */
int i_id; /* identificator for area */
unsigned int i_id; /* identificator for area */
off_t i_start; /* start offset of area */
off_t i_size; /* total size of the area
* (in arbitrary units) */
......@@ -143,8 +143,8 @@ struct input_area_t
* (changed by the interface thread */
/* area subdivision */
int i_part_nb; /* number of parts (chapter for DVD)*/
int i_part; /* currently selected part */
unsigned int i_part_nb; /* number of parts (chapter for DVD)*/
unsigned int i_part; /* currently selected part */
/* offset to plugin related data */
......@@ -215,13 +215,13 @@ struct stream_descriptor_t
* or modify stream, pgrm or es */
/* Input method data */
int i_method; /* input method for stream: file,
unsigned int i_method; /* input method for stream: file,
disc or network */
vlc_bool_t b_pace_control; /* can we read when we want ? */
vlc_bool_t b_seekable; /* can we do lseek() ? */
/* if (b_seekable) : */
int i_area_nb;
unsigned int i_area_nb;
input_area_t ** pp_areas; /* list of areas in stream == offset
* interval with own properties */
input_area_t * p_selected_area;
......@@ -232,7 +232,7 @@ struct stream_descriptor_t
* units of 50 bytes/s) ; 0 if undef */
/* New status and rate requested by the interface */
int i_new_status, i_new_rate;
unsigned int i_new_status, i_new_rate;
int b_new_mute; /* int because it can be -1 */
vlc_cond_t stream_wait; /* interface -> input in case of a
* status change request */
......@@ -241,15 +241,15 @@ struct stream_descriptor_t
stream_sys_t * p_demux_data;
/* Programs descriptions */
int i_pgrm_number; /* size of the following array */
unsigned int i_pgrm_number; /* size of the following array */
pgrm_descriptor_t ** pp_programs; /* array of pointers to pgrm */
pgrm_descriptor_t * p_selected_program; /* currently
selected program */
pgrm_descriptor_t * p_new_program; /* Newly selected program */
/* ES descriptions */
int i_es_number;
unsigned int i_es_number;
es_descriptor_t ** pp_es; /* carried elementary streams */
int i_selected_es_number;
unsigned int i_selected_es_number;
es_descriptor_t ** pp_selected_es; /* ES with a decoder */
es_descriptor_t * p_newly_selected_es; /* ES selected from
* the interface */
......
......@@ -8,7 +8,7 @@
* -udf.* to find files
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: access.c,v 1.5 2002/11/13 20:23:21 fenrir Exp $
* $Id: access.c,v 1.6 2002/12/06 16:34:04 sam Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......
......@@ -2,7 +2,7 @@
* dvd.h: thread structure of the DVD plugin
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: dvd.h,v 1.1 2002/08/04 17:23:41 sam Exp $
* $Id: dvd.h,v 1.2 2002/12/06 16:34:04 sam Exp $
*
* Author: Stéphane Borel <stef@via.ecp.fr>
*
......@@ -36,27 +36,27 @@ typedef struct thread_dvd_data_s
{
dvdcss_handle dvdhandle; /* libdvdcss handle */
int i_audio_nb;
int i_spu_nb;
unsigned int i_audio_nb;
unsigned int i_spu_nb;
/* Navigation information */
int i_title;
int i_title_id;
unsigned int i_title;
unsigned int i_title_id;
int i_chapter_nb;
int i_chapter;
unsigned int i_chapter_nb;
unsigned int i_chapter;
vlc_bool_t b_new_chapter;
int i_angle_nb;
int i_angle;
unsigned int i_angle_nb;
unsigned int i_angle;
int i_map_cell; /* cell index in adress map */
int i_prg_cell; /* cell index in program map */
int i_angle_cell; /* cell index in the current angle */
unsigned int i_map_cell; /* cell index in adress map */
unsigned int i_prg_cell; /* cell index in program map */
unsigned int i_angle_cell; /* cell index in the current angle */
int i_vts_start; /* offset to beginning of vts */
int i_vts_lb; /* sector in vts */
int i_last_lb; /* last sector of current cell */
unsigned int i_vts_start; /* offset to beginning of vts */
unsigned int i_vts_lb; /* sector in vts */
unsigned int i_last_lb; /* last sector of current cell */
/* Structure that contains all information of the DVD */
struct ifo_s * p_ifo;
......
/* es.c: functions to find and select ES
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: es.c,v 1.3 2002/11/05 18:25:43 gbazin Exp $
* $Id: es.c,v 1.4 2002/12/06 16:34:04 sam Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......@@ -248,8 +248,8 @@ void DVDReadSPU( input_thread_t * p_input )
void DVDLaunchDecoders( input_thread_t * p_input )
{
thread_dvd_data_t * p_dvd;
int i_audio;
int i_spu;
unsigned int i_audio;
unsigned int i_spu;
p_dvd = (thread_dvd_data_t*)(p_input->p_access_data);
......@@ -303,7 +303,7 @@ void DVDLaunchDecoders( input_thread_t * p_input )
}
if( i_spu > 0 )
{
int i = 0, j = 0;
unsigned int i = 0, j = 0;
for( i = 0; i < p_input->stream.i_es_number; i++ )
{
if ( p_input->stream.pp_es[i]->i_fourcc
......
/* seek.c: functions to navigate through DVD.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: seek.c,v 1.2 2002/08/08 00:35:10 sam Exp $
* $Id: seek.c,v 1.3 2002/12/06 16:34:04 sam Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......@@ -135,7 +135,7 @@ int CellLastSector( thread_dvd_data_t * p_dvd )
int NextCellPrg( thread_dvd_data_t * p_dvd )
{
int i_cell = p_dvd->i_prg_cell;
unsigned int i_cell = p_dvd->i_prg_cell;
if( p_dvd->i_vts_lb > title.p_cell_play[i_cell].i_last_sector )
{
......@@ -153,7 +153,7 @@ int NextCellPrg( thread_dvd_data_t * p_dvd )
int Lb2CellPrg( thread_dvd_data_t * p_dvd )
{
int i_cell = 0;
unsigned int i_cell = 0;
while( p_dvd->i_vts_lb > title.p_cell_play[i_cell].i_last_sector )
{
......@@ -239,8 +239,8 @@ int LbMaxOnce( thread_dvd_data_t * p_dvd )
int CellPrg2Chapter( thread_dvd_data_t * p_dvd )
{
int i_chapter = 1;
int i_cell = p_dvd->i_prg_cell;
unsigned int i_chapter = 1;
unsigned int i_cell = p_dvd->i_prg_cell;
if( CellIsInterleaved( p_dvd ) )
{
......@@ -285,7 +285,7 @@ int NextChapter( thread_dvd_data_t * p_dvd )
int DVDSetChapter( thread_dvd_data_t * p_dvd, int i_chapter )
int DVDSetChapter( thread_dvd_data_t * p_dvd, unsigned int i_chapter )
{
if( i_chapter <= 0 || i_chapter > p_dvd->i_chapter_nb )
{
......
/* dvd_seek.h: DVD access plugin.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: seek.h,v 1.1 2002/08/04 17:23:41 sam Exp $
* $Id: seek.h,v 1.2 2002/12/06 16:34:04 sam Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......@@ -33,5 +33,5 @@ int LbMaxOnce ( thread_dvd_data_t * );
int CellPrg2Chapter ( thread_dvd_data_t * );
int NextChapter ( thread_dvd_data_t * );
int DVDSetChapter ( thread_dvd_data_t *, int );
int DVDSetChapter ( thread_dvd_data_t *, unsigned int );
......@@ -5,7 +5,7 @@
* contains the basic udf handling functions
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: udf.c,v 1.3 2002/08/08 22:28:22 sam Exp $
* $Id: udf.c,v 1.4 2002/12/06 16:34:04 sam Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......@@ -63,28 +63,28 @@
typedef struct partition_s
{
vlc_bool_t b_valid;
u8 pi_volume_desc[128];
u16 i_flags;
u16 i_number;
u8 pi_contents[32];
u32 i_access_type;
u32 i_start;
u32 i_length;
uint8_t pi_volume_desc[128];
uint16_t i_flags;
uint16_t i_number;
uint8_t pi_contents[32];
uint32_t i_access_type;
uint32_t i_start;
uint32_t i_length;
dvdcss_handle dvdhandle;
} partition_t;
typedef struct ad_s
{
u32 i_location;
u32 i_length;
u8 i_flags;
u16 i_partition;
uint32_t i_location;
uint32_t i_length;
uint8_t i_flags;
uint16_t i_partition;
} ad_t;
/* for direct data access, LSB first */
#define GETN1(p) ((u8)pi_data[p])
#define GETN2(p) ((u16)pi_data[p]|((u16)pi_data[(p)+1]<<8))
#define GETN4(p) ((u32)pi_data[p]|((u32)pi_data[(p)+1]<<8)|((u32)pi_data[(p)+2]<<16)|((u32)pi_data[(p)+3]<<24))
#define GETN1(p) ((uint8_t)pi_data[p])
#define GETN2(p) ((uint16_t)pi_data[p]|((uint16_t)pi_data[(p)+1]<<8))
#define GETN4(p) ((uint32_t)pi_data[p]|((uint32_t)pi_data[(p)+1]<<8)|((uint32_t)pi_data[(p)+2]<<16)|((uint32_t)pi_data[(p)+3]<<24))
#define GETN(p,n,target) memcpy(target,&pi_data[p],n)
......@@ -94,7 +94,7 @@ typedef struct ad_s
* Returns number of read bytes on success, 0 on error
*****************************************************************************/
static int UDFReadLB( dvdcss_handle dvdhandle, off_t i_lba,
size_t i_block_count, u8 *pi_data )
size_t i_block_count, uint8_t *pi_data )
{
if( dvdcss_seek( dvdhandle, i_lba, DVDCSS_NOFLAGS ) < 0 )
{
......@@ -111,7 +111,7 @@ static int UDFReadLB( dvdcss_handle dvdhandle, off_t i_lba,
/*****************************************************************************
* UDFDecode: decode unicode encoded udf data
*****************************************************************************/
static int UDFDecode( u8 * pi_data, int i_len, char * psz_target )
static int UDFDecode( uint8_t * pi_data, int i_len, char * psz_target )
{
int p = 1;
int i = 0;
......@@ -150,7 +150,7 @@ static int UDFDecode( u8 * pi_data, int i_len, char * psz_target )
*
**/
int UDFEntity (u8 *data, u8 *Flags, char *Identifier)
int UDFEntity (uint8_t *data, uint8_t *Flags, char *Identifier)
{
Flags[0] = data[0];
strncpy (Identifier, &data[1], 5);
......@@ -163,7 +163,7 @@ int UDFEntity (u8 *data, u8 *Flags, char *Identifier)
/*****************************************************************************
* UDFDescriptor: gives a tag ID from your data to find out what it refers to
*****************************************************************************/
static int UDFDescriptor( u8 * pi_data, u16 * pi_tag_id )
static int UDFDescriptor( uint8_t * pi_data, uint16_t * pi_tag_id )
{
pi_tag_id[0] = GETN2( 0 );
/* TODO: check CRC 'n stuff */
......@@ -175,7 +175,8 @@ static int UDFDescriptor( u8 * pi_data, u16 * pi_tag_id )
/*****************************************************************************
* UDFExtendAD: main volume information
*****************************************************************************/
static int UDFExtentAD (u8 * pi_data, u32 * pi_length, u32 * pi_location)
static int UDFExtentAD ( uint8_t * pi_data, uint32_t * pi_length,
uint32_t * pi_location)
{
pi_length[0] = GETN4( 0 );
pi_location[0] = GETN4( 4 );
......@@ -187,7 +188,7 @@ static int UDFExtentAD (u8 * pi_data, u32 * pi_length, u32 * pi_location)
/*****************************************************************************
* UDFAD: file set information
*****************************************************************************/
static int UDFAD( u8 * pi_data, struct ad_s * p_ad, u8 i_type,
static int UDFAD( uint8_t * pi_data, struct ad_s * p_ad, uint8_t i_type,
struct partition_s partition )
{
p_ad->i_length = GETN4( 0 );
......@@ -220,7 +221,8 @@ static int UDFAD( u8 * pi_data, struct ad_s * p_ad, u8 i_type,
/*****************************************************************************
* UDFICB: takes Information Control Block from pi_data
*****************************************************************************/
static int UDFICB( u8 * pi_data, u8 * pi_file_type, u16 * pi_flags)
static int UDFICB( uint8_t * pi_data, uint8_t * pi_file_type,
uint16_t * pi_flags)
{
pi_file_type[0] = GETN1( 11 );
pi_flags[0] = GETN2( 18 );
......@@ -232,8 +234,9 @@ static int UDFICB( u8 * pi_data, u8 * pi_file_type, u16 * pi_flags)
/*****************************************************************************
* UDFPartition: gets partition descriptor
*****************************************************************************/
static int UDFPartition( u8 * pi_data, u16 * pi_flags, u16 * pi_nb,
byte_t * ps_contents, u32 * pi_start, u32 * pi_length )
static int UDFPartition( uint8_t * pi_data, uint16_t * pi_flags,
uint16_t * pi_nb, byte_t * ps_contents,
uint32_t * pi_start, uint32_t * pi_length )
{
pi_flags[0] = GETN2( 20 );
pi_nb[0] = GETN2( 22 );
......@@ -250,11 +253,11 @@ static int UDFPartition( u8 * pi_data, u16 * pi_flags, u16 * pi_nb,
*****************************************************************************
* Returns 0 on OK, 1 on error
*****************************************************************************/
static int UDFLogVolume(u8 * pi_data, byte_t * p_volume_descriptor )
static int UDFLogVolume( uint8_t * pi_data, byte_t * p_volume_descriptor )
{
u32 i_lb_size;
u32 i_MT_L;
u32 i_N_PM;
uint32_t i_lb_size;
uint32_t i_MT_L;
uint32_t i_N_PM;
UDFDecode( &pi_data[84], 128, (char *)p_volume_descriptor );
......@@ -277,14 +280,14 @@ static int UDFLogVolume(u8 * pi_data, byte_t * p_volume_descriptor )
/*****************************************************************************
* UDFFileEntry: fills a ad_t struct with information at pi_data
*****************************************************************************/
static int UDFFileEntry( u8 * pi_data, u8 * pi_file_type, struct ad_s * p_ad,
struct partition_s partition )
static int UDFFileEntry( uint8_t * pi_data, uint8_t * pi_file_type,
struct ad_s * p_ad, struct partition_s partition )
{
u8 i_file_type;
u16 i_flags;
u32 i_L_EA;
u32 i_L_AD;
int p;
uint8_t i_file_type;
uint16_t i_flags;
uint32_t i_L_EA;
uint32_t i_L_AD;
unsigned int p;
UDFICB( &pi_data[16], &i_file_type, &i_flags );
......@@ -335,14 +338,14 @@ static int UDFFileEntry( u8 * pi_data, u8 * pi_file_type, struct ad_s * p_ad,
/*****************************************************************************
* UDFFileIdentifier: gives filename and characteristics of pi_data
*****************************************************************************/
static int UDFFileIdentifier( u8 * pi_data, u8 * pi_file_characteristics,
static int UDFFileIdentifier( uint8_t * pi_data, uint8_t * pi_file_info,
char * psz_filename, struct ad_s * p_file_icb,
struct partition_s partition )
{
u8 i_L_FI;
u16 i_L_IU;
uint8_t i_L_FI;
uint16_t i_L_IU;
pi_file_characteristics[0] = GETN1( 18 );
pi_file_info[0] = GETN1( 18 );
i_L_FI = GETN1( 19 );
UDFAD( &pi_data[20], p_file_icb, UDFADlong, partition );
i_L_IU = GETN2( 36 );
......@@ -368,12 +371,12 @@ static int UDFFileIdentifier( u8 * pi_data, u8 * pi_file_characteristics,
* File: Location of file the ICB is pointing to
* return 1 on success, 0 on error;
*****************************************************************************/
static int UDFMapICB( struct ad_s icb, u8 * pi_file_type, struct ad_s * p_file,
struct partition_s partition )
static int UDFMapICB( struct ad_s icb, uint8_t * pi_file_type,
struct ad_s * p_file, struct partition_s partition )
{
u8 pi_lb[DVD_LB_SIZE];
u32 i_lba;
u16 i_tag_id;
uint8_t pi_lb[DVD_LB_SIZE];
uint32_t i_lba;
uint16_t i_tag_id;
i_lba = partition.i_start + icb.i_location;
......@@ -411,12 +414,12 @@ static int UDFMapICB( struct ad_s icb, u8 * pi_file_type, struct ad_s * p_file,
static int UDFScanDir( struct ad_s dir, char * psz_filename,
struct ad_s * p_file_icb, struct partition_s partition )
{
u8 pi_lb[2*DVD_LB_SIZE];
u32 i_lba;
u16 i_tag_id;
u8 i_file_char;
uint8_t pi_lb[2*DVD_LB_SIZE];
uint32_t i_lba;
uint16_t i_tag_id;
uint8_t i_file_char;
char psz_temp[DVD_LB_SIZE];
int p;
unsigned int p;
/* Scan dir for ICB of file */
i_lba = partition.i_start + dir.i_location;
......@@ -503,13 +506,13 @@ static int UDFScanDir( struct ad_s dir, char * psz_filename,
*****************************************************************************/
static int UDFFindPartition( int i_part_nb, struct partition_s *p_partition )
{
u8 pi_lb[DVD_LB_SIZE];
u8 pi_anchor[DVD_LB_SIZE];
u16 i_tag_id;
u32 i_lba;
u32 i_MVDS_location;
u32 i_MVDS_length;
u32 i_last_sector;
uint8_t pi_lb[DVD_LB_SIZE];
uint8_t pi_anchor[DVD_LB_SIZE];
uint16_t i_tag_id;
uint32_t i_lba;
uint32_t i_MVDS_location;
uint32_t i_MVDS_length;
uint32_t i_last_sector;
vlc_bool_t b_term;
vlc_bool_t b_vol_valid;
int i;
......@@ -645,16 +648,16 @@ static int UDFFindPartition( int i_part_nb, struct partition_s *p_partition )
* starting with '/'.
* returns absolute LB number, or 0 on error
*****************************************************************************/
u32 DVDUDFFindFile( dvdcss_handle dvdhandle, char * psz_path )
uint32_t DVDUDFFindFile( dvdcss_handle dvdhandle, char * psz_path )
{
struct partition_s partition;
struct ad_s root_icb;
struct ad_s file;
struct ad_s icb;
u32 i_lba;
u16 i_tag_id;
u8 pi_lb[DVD_LB_SIZE];
u8 i_file_type;
uint32_t i_lba;
uint16_t i_tag_id;
uint8_t pi_lb[DVD_LB_SIZE];
uint8_t i_file_type;
char psz_tokenline[DVD_LB_SIZE] = "";
char * psz_token;
int i_partition;
......
......@@ -2,7 +2,7 @@
* access.c: access capabilities for dvdplay plugin.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: access.c,v 1.6 2002/11/13 20:23:21 fenrir Exp $
* $Id: access.c,v 1.7 2002/12/06 16:34:04 sam Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......@@ -78,11 +78,11 @@ int E_(OpenDVD) ( vlc_object_t *p_this )
char * psz_source;
dvd_data_t * p_dvd;
input_area_t * p_area;
int i_title_nr;
int i_title;
int i_chapter;
int i_angle;
int i;
unsigned int i_title_nr;
unsigned int i_title;
unsigned int i_chapter;
unsigned int i_angle;
unsigned int i;
p_dvd = malloc( sizeof(dvd_data_t) );
if( p_dvd == NULL )
......@@ -377,7 +377,7 @@ static void pf_vmg_callback( void* p_args, dvdplay_event_t event )
input_thread_t * p_input;
dvd_data_t * p_dvd;
vlc_value_t val;
int i;
unsigned int i;
p_input = (input_thread_t*)p_args;
p_dvd = (dvd_data_t*)p_input->p_access_data;
......@@ -395,8 +395,8 @@ static void pf_vmg_callback( void* p_args, dvdplay_event_t event )
/* prevent intf to try to seek by default */
p_input->stream.b_seekable = 0;
if( ( i = dvdplay_title_cur( p_dvd->vmg ) ) !=
p_input->stream.p_selected_area->i_id )
i = dvdplay_title_cur( p_dvd->vmg );
if( i != p_input->stream.p_selected_area->i_id )
{
/* the title number has changed: update area */
msg_Warn( p_input, "new title %d (%d)", i,
......
......@@ -2,7 +2,7 @@
* rtp.c: RTP access plug-in
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: rtp.c,v 1.6 2002/11/13 20:23:21 fenrir Exp $
* $Id: rtp.c,v 1.7 2002/12/06 16:34:04 sam Exp $
*
* Authors: Tristan Leteurtre <tooney@via.ecp.fr>
*
......@@ -332,7 +332,7 @@ static ssize_t RTPNetworkRead( input_thread_t * p_input, byte_t * p_buffer,
/* Return the packet without the RTP header. */
i_ret -= ( RTP_HEADER_LEN + 4 * i_CSRC_count );
if ( i_ret > i_len )
if ( (size_t)i_ret > i_len )
{
/* This should NOT happen. */
msg_Warn( p_input, "RTP input trashing %d bytes", i_ret - i_len );
......
......@@ -2,7 +2,7 @@
* vcd.c : VCD input module for vlc
*****************************************************************************
* Copyright (C) 2000 VideoLAN
* $Id: vcd.c,v 1.11 2002/11/13 20:23:21 fenrir Exp $
* $Id: vcd.c,v 1.12 2002/12/06 16:34:04 sam Exp $
*
* Author: Johan Bilien <jobi@via.ecp.fr>
*
......@@ -437,7 +437,7 @@ static int VCDSetArea( input_thread_t * p_input, input_area_t * p_area )
static void VCDSeek( input_thread_t * p_input, off_t i_off )
{
thread_vcd_data_t * p_vcd;
int i_index;
unsigned int i_index;
p_vcd = (thread_vcd_data_t *) p_input->p_access_data;
......
......@@ -2,7 +2,7 @@
* a52tospdif.c : encapsulates A/52 frames into S/PDIF packets
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: a52tospdif.c,v 1.15 2002/11/28 23:24:14 massiot Exp $
* $Id: a52tospdif.c,v 1.16 2002/12/06 16:34:04 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Stphane Borel <stef@via.ecp.fr>
......