Skip to content

V
vlc-gpu
Commit 0e39834a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Compiler warnings rampage

parent a6361e58
Show whitespace changes
Inline Side-by-side
Showing with 149 additions and 67 deletions
include/vlc_osd.h
View file @ 0e39834a
......@@ -610,7 +610,7 @@ VLC_EXPORT( int, vout_ShowTextRelative, ( vout_thread_t *, int, char *, text_sty
* if this is 0 the string will be shown untill the next string
* is about to be shown
*/
VLC_EXPORT( int, vout_ShowTextAbsolute, ( vout_thread_t *, int, char *, text_style_t *, int, int, int, mtime_t, mtime_t ) );
VLC_EXPORT( int, vout_ShowTextAbsolute, ( vout_thread_t *, int, const char *, text_style_t *, int, int, int, mtime_t, mtime_t ) );
/**
* Write an informative message at the default location,
......@@ -619,7 +619,7 @@ VLC_EXPORT( int, vout_ShowTextAbsolute, ( vout_thread_t *, int, char *, text_sty
* \param i_channel Subpicture channel
* \param psz_format printf style formatting
**/
VLC_EXPORT( void, __vout_OSDMessage, ( vlc_object_t *, int, char *, ... ) );
VLC_EXPORT( void, __vout_OSDMessage, ( vlc_object_t *, int, const char *, ... ) );
/**
* Same as __vlc_OSDMessage() but with automatic casting
......
src/audio_output/common.c
View file @ 0e39834a
/*****************************************************************************
* common.c : audio output management of common data structures
*****************************************************************************
* Copyright (C) 2002-2005 the VideoLAN team
* Copyright (C) 2002-2007 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
......@@ -308,6 +308,7 @@ void aout_FifoInit( aout_instance_t * p_aout, aout_fifo_t * p_fifo,
void aout_FifoPush( aout_instance_t * p_aout, aout_fifo_t * p_fifo,
aout_buffer_t * p_buffer )
{
(void)p_aout;
*p_fifo->pp_last = p_buffer;
p_fifo->pp_last = &p_buffer->p_next;
*p_fifo->pp_last = NULL;
......@@ -332,6 +333,7 @@ void aout_FifoSet( aout_instance_t * p_aout, aout_fifo_t * p_fifo,
mtime_t date )
{
aout_buffer_t * p_buffer;
(void)p_aout;
aout_DateSet( &p_fifo->end_date, date );
p_buffer = p_fifo->p_first;
......@@ -352,6 +354,7 @@ void aout_FifoMoveDates( aout_instance_t * p_aout, aout_fifo_t * p_fifo,
mtime_t difference )
{
aout_buffer_t * p_buffer;
(void)p_aout;
aout_DateMove( &p_fifo->end_date, difference );
p_buffer = p_fifo->p_first;
......@@ -368,6 +371,7 @@ void aout_FifoMoveDates( aout_instance_t * p_aout, aout_fifo_t * p_fifo,
*****************************************************************************/
mtime_t aout_FifoNextStart( aout_instance_t * p_aout, aout_fifo_t * p_fifo )
{
(void)p_aout;
return aout_DateGet( &p_fifo->end_date );
}
......@@ -377,6 +381,7 @@ mtime_t aout_FifoNextStart( aout_instance_t * p_aout, aout_fifo_t * p_fifo )
*****************************************************************************/
mtime_t aout_FifoFirstDate( aout_instance_t * p_aout, aout_fifo_t * p_fifo )
{
(void)p_aout;
return p_fifo->p_first ? p_fifo->p_first->start_date : 0;
}
......@@ -386,6 +391,7 @@ mtime_t aout_FifoFirstDate( aout_instance_t * p_aout, aout_fifo_t * p_fifo )
aout_buffer_t * aout_FifoPop( aout_instance_t * p_aout, aout_fifo_t * p_fifo )
{
aout_buffer_t * p_buffer;
(void)p_aout;
p_buffer = p_fifo->p_first;
if ( p_buffer == NULL ) return NULL;
......@@ -404,6 +410,7 @@ aout_buffer_t * aout_FifoPop( aout_instance_t * p_aout, aout_fifo_t * p_fifo )
void aout_FifoDestroy( aout_instance_t * p_aout, aout_fifo_t * p_fifo )
{
aout_buffer_t * p_buffer;
(void)p_aout;
p_buffer = p_fifo->p_first;
while ( p_buffer != NULL )
......
src/audio_output/dec.c
View file @ 0e39834a
/*****************************************************************************
* dec.c : audio output API towards decoders
*****************************************************************************
* Copyright (C) 2002-2004 the VideoLAN team
* Copyright (C) 2002-2007 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
......@@ -285,6 +285,7 @@ aout_buffer_t * aout_DecNewBuffer( aout_instance_t * p_aout,
void aout_DecDeleteBuffer( aout_instance_t * p_aout, aout_input_t * p_input,
aout_buffer_t * p_buffer )
{
(void)p_aout; (void)p_input;
aout_BufferFree( p_buffer );
}
......
src/audio_output/filters.c
View file @ 0e39834a
/*****************************************************************************
* filters.c : audio output filters management
*****************************************************************************
* Copyright (C) 2002-2006 the VideoLAN team
* Copyright (C) 2002-2007 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
......@@ -266,6 +266,7 @@ void aout_FiltersDestroyPipeline( aout_instance_t * p_aout,
int i_nb_filters )
{
int i;
(void)p_aout;
for ( i = 0; i < i_nb_filters; i++ )
{
......
src/audio_output/input.c
View file @ 0e39834a
/*****************************************************************************
* input.c : internal management of input streams for the audio output
*****************************************************************************
* Copyright (C) 2002-2004 the VideoLAN team
* Copyright (C) 2002-2007 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
......@@ -43,7 +43,7 @@
/** FIXME: Ugly but needed to access the counters */
#include "input/input_internal.h"
static void inputFailure( aout_instance_t *, aout_input_t *, char * );
static void inputFailure( aout_instance_t *, aout_input_t *, const char * );
static int VisualizationCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
static int EqualizerCallback( vlc_object_t *, char const *,
......@@ -134,8 +134,8 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input )
for( i = 0; i < p_config->i_list; i++ )
{
val.psz_string = p_config->ppsz_list[i];
text.psz_string = p_config->ppsz_list_text[i];
val.psz_string = (char *)p_config->ppsz_list[i];
text.psz_string = (char *)p_config->ppsz_list_text[i];
var_Change( p_aout, "equalizer", VLC_VAR_ADDCHOICE,
&val, &text );
}
......@@ -630,10 +630,10 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
*****************************************************************************/
static void inputFailure( aout_instance_t * p_aout, aout_input_t * p_input,
char * psz_error_message )
const char * psz_error_message )
{
/* error message */
msg_Err( p_aout, "couldn't set an input pipeline" );
msg_Err( p_aout, "%s", psz_error_message );
/* clean up */
aout_FiltersDestroyPipeline( p_aout, p_input->pp_filters,
......@@ -703,6 +703,7 @@ static int VisualizationCallback( vlc_object_t *p_this, char const *psz_cmd,
char *psz_mode = newval.psz_string;
vlc_value_t val;
int i;
(void)psz_cmd; (void)oldval; (void)p_data;
if( !psz_mode || !*psz_mode )
{
......@@ -753,6 +754,7 @@ static int EqualizerCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t val;
int i;
int i_ret;
(void)psz_cmd; (void)oldval; (void)p_data;
if( !psz_mode || !*psz_mode )
{
......
src/audio_output/intf.c
View file @ 0e39834a
/*****************************************************************************
* intf.c : audio output API towards the interface modules
*****************************************************************************
* Copyright (C) 2002-2004 the VideoLAN team
* Copyright (C) 2002-2007 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
......@@ -285,6 +285,7 @@ void aout_VolumeSoftInit( aout_instance_t * p_aout )
/* Placeholder for pf_volume_infos(). */
int aout_VolumeSoftInfos( aout_instance_t * p_aout, audio_volume_t * pi_soft )
{
(void)p_aout;
*pi_soft = 0;
return 0;
}
......@@ -321,18 +322,21 @@ void aout_VolumeNoneInit( aout_instance_t * p_aout )
/* Placeholder for pf_volume_infos(). */
int aout_VolumeNoneInfos( aout_instance_t * p_aout, audio_volume_t * pi_soft )
{
(void)p_aout; (void)pi_soft;
return -1;
}
/* Placeholder for pf_volume_get(). */
int aout_VolumeNoneGet( aout_instance_t * p_aout, audio_volume_t * pi_volume )
{
(void)p_aout; (void)pi_volume;
return -1;
}
/* Placeholder for pf_volume_set(). */
int aout_VolumeNoneSet( aout_instance_t * p_aout, audio_volume_t i_volume )
{
(void)p_aout; (void)i_volume;
return -1;
}
......@@ -419,11 +423,12 @@ int aout_Restart( aout_instance_t * p_aout )
* rebuilding the audio-device and audio-channels variables.
*****************************************************************************/
int aout_FindAndRestart( vlc_object_t * p_this, const char *psz_name,
vlc_value_t oldval, vlc_value_t val, void *p_data )
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
aout_instance_t * p_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT,
FIND_ANYWHERE );
(void)psz_name; (void)oldval; (void)newval; (void)p_data;
if ( p_aout == NULL ) return VLC_SUCCESS;
if ( var_Type( p_aout, "audio-device" ) != 0 )
......@@ -445,10 +450,11 @@ int aout_FindAndRestart( vlc_object_t * p_this, const char *psz_name,
* aout_ChannelsRestart : change the audio device or channels and restart
*****************************************************************************/
int aout_ChannelsRestart( vlc_object_t * p_this, const char * psz_variable,
vlc_value_t old_value, vlc_value_t new_value,
void * unused )
vlc_value_t oldval, vlc_value_t newval,
void *p_data )
{
aout_instance_t * p_aout = (aout_instance_t *)p_this;
(void)oldval; (void)newval; (void)p_data;
if ( !strcmp( psz_variable, "audio-device" ) )
{
......@@ -537,5 +543,6 @@ void aout_EnableFilter( vlc_object_t *p_this, const char *psz_name,
*/
char *aout_VisualChange( vlc_object_t *p_this, int i_skip )
{
(void)p_this; (void)i_skip;
return strdup("foobar");
}
src/extras/libc.c
View file @ 0e39834a
......@@ -923,6 +923,7 @@ int __vlc_execve( vlc_object_t *p_object, int i_argc, char *const *ppsz_argv,
const char *p_in, size_t i_in,
char **pp_data, size_t *pi_data )
{
(void)i_argc; // <-- hmph
#ifdef HAVE_FORK
# define BUFSIZE 1024
int fds[2], i_status;
......
src/input/input.c
View file @ 0e39834a
/*****************************************************************************
* input.c: input thread
*****************************************************************************
* Copyright (C) 1998-2004 the VideoLAN team
* Copyright (C) 1998-2007 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
......@@ -74,7 +74,7 @@ static void MRLSections( input_thread_t *, char *, int *, int *, int *, int *);
static input_source_t *InputSourceNew( input_thread_t *);
static int InputSourceInit( input_thread_t *, input_source_t *,
const char *, const char *psz_forced_demux );
static void InputSourceClean( input_thread_t *, input_source_t * );
static void InputSourceClean( input_source_t * );
static void SlaveDemux( input_thread_t *p_input );
static void SlaveSeek( input_thread_t *p_input );
......@@ -1238,12 +1238,12 @@ static void End( input_thread_t * p_input )
input_ControlVarClean( p_input );
/* Clean up master */
InputSourceClean( p_input, &p_input->p->input );
InputSourceClean( &p_input->p->input );
/* Delete slave */
for( i = 0; i < p_input->p->i_slave; i++ )
{
InputSourceClean( p_input, p_input->p->slave[i] );
InputSourceClean( p_input->p->slave[i] );
free( p_input->p->slave[i] );
}
if( p_input->p->slave ) free( p_input->p->slave );
......@@ -1850,7 +1850,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type,
DEMUX_GET_TIME, &i_time ) )
{
msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
InputSourceClean( p_input, slave );
InputSourceClean( slave );
free( slave );
break;
}
......@@ -1858,7 +1858,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type,
DEMUX_SET_TIME, i_time ) )
{
msg_Err( p_input, "seek failed for new slave" );
InputSourceClean( p_input, slave );
InputSourceClean( slave );
free( slave );
break;
}
......@@ -2326,7 +2326,7 @@ error:
/*****************************************************************************
* InputSourceClean:
*****************************************************************************/
static void InputSourceClean( input_thread_t *p_input, input_source_t *in )
static void InputSourceClean( input_source_t *in )
{
if( in->p_demux )
demux2_Delete( in->p_demux );
......@@ -2480,6 +2480,8 @@ void MRLSplit( vlc_object_t *p_input, char *psz_dup,
psz_path = psz_dup;
}
else
#else
(void)p_input;
#endif
if( psz )
......
src/input/var.c
View file @ 0e39834a
/*****************************************************************************
* var.c: object variables for input thread
*****************************************************************************
* Copyright (C) 2004 the VideoLAN team
* Copyright (C) 2004-2007 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
......@@ -479,7 +479,7 @@ static int StateCallback( vlc_object_t *p_this, char const *psz_cmd,
void *p_data )
{
input_thread_t *p_input = (input_thread_t*)p_this;
(void)psz_cmd; (void)oldval; (void)p_data;
if( newval.i_int == PLAYING_S || newval.i_int == PAUSE_S )
{
......@@ -494,6 +494,7 @@ static int RateCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
input_thread_t *p_input = (input_thread_t*)p_this;
(void)oldval; (void)p_data;
/* Problem with this way: the "rate" variable is update after the input thread do the change */
if( !strcmp( psz_cmd, "rate-slower" ) )
......@@ -518,6 +519,7 @@ static int PositionCallback( vlc_object_t *p_this, char const *psz_cmd,
{
input_thread_t *p_input = (input_thread_t*)p_this;
vlc_value_t val, length;
(void)oldval; (void)p_data;
if( !strcmp( psz_cmd, "position-offset" ) )
{
......@@ -550,6 +552,7 @@ static int TimeCallback( vlc_object_t *p_this, char const *psz_cmd,
{
input_thread_t *p_input = (input_thread_t*)p_this;
vlc_value_t val, length;
(void)oldval; (void)p_data;
if( !strcmp( psz_cmd, "time-offset" ) )
{
......@@ -581,6 +584,7 @@ static int ProgramCallback( vlc_object_t *p_this, char const *psz_cmd,
void *p_data )
{
input_thread_t *p_input = (input_thread_t*)p_this;
(void)psz_cmd; (void)oldval; (void)p_data;
input_ControlPush( p_input, INPUT_CONTROL_SET_PROGRAM, &newval );
......@@ -593,6 +597,7 @@ static int TitleCallback( vlc_object_t *p_this, char const *psz_cmd,
{
input_thread_t *p_input = (input_thread_t*)p_this;
vlc_value_t val, count;
(void)oldval; (void)p_data;
if( !strcmp( psz_cmd, "next-title" ) )
{
......@@ -625,6 +630,7 @@ static int SeekpointCallback( vlc_object_t *p_this, char const *psz_cmd,
{
input_thread_t *p_input = (input_thread_t*)p_this;
vlc_value_t val, count;
(void)oldval; (void)p_data;
if( !strcmp( psz_cmd, "next-chapter" ) )
{
......@@ -657,6 +663,7 @@ static int NavigationCallback( vlc_object_t *p_this, char const *psz_cmd,
{
input_thread_t *p_input = (input_thread_t*)p_this;
vlc_value_t val;
(void)psz_cmd; (void)oldval;
/* Issue a title change */
val.i_int = (int)p_data;
......@@ -676,6 +683,7 @@ static int ESCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
input_thread_t *p_input = (input_thread_t*)p_this;
(void)oldval; (void)p_data;
if( newval.i_int < 0 )
{
......@@ -701,10 +709,10 @@ static int ESCallback( vlc_object_t *p_this, char const *psz_cmd,
}
static int EsDelayCallback ( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p )
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
input_thread_t *p_input = (input_thread_t*)p_this;
(void)oldval; (void)p_data;
if( !strcmp( psz_cmd, "audio-delay" ) )
{
......@@ -725,6 +733,7 @@ static int BookmarkCallback( vlc_object_t *p_this, char const *psz_cmd,
void *p_data )
{
input_thread_t *p_input = (input_thread_t*)p_this;
(void)psz_cmd; (void)oldval; (void)p_data;
input_ControlPush( p_input, INPUT_CONTROL_SET_BOOKMARK, &newval );
......
src/interface/interface.c
View file @ 0e39834a
......@@ -3,7 +3,7 @@
* This library provides basic functions for threads to interact with user
* interface, such as command line.
*****************************************************************************
* Copyright (C) 1998-2004 the VideoLAN team
* Copyright (C) 1998-2007 the VideoLAN team
* $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
......@@ -398,6 +398,7 @@ static int SwitchIntfCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
(void)psz_cmd; (void)oldval; (void)p_data;
p_intf->psz_switch_intf =
malloc( strlen(newval.psz_string) + sizeof(",none") );
......@@ -413,6 +414,8 @@ static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd,
intf_thread_t *p_intf;
char *psz_intf = malloc( strlen(newval.psz_string) + sizeof(",none") );
(void)psz_cmd; (void)oldval; (void)p_data;
/* Try to create the interface */
sprintf( psz_intf, "%s,none", newval.psz_string );
p_intf = intf_Create( p_this->p_libvlc, psz_intf, 0, NULL );
......
src/libvlc.c
View file @ 0e39834a
/*****************************************************************************
* libvlc.c: Implementation of the old libvlc API
*****************************************************************************
* Copyright (C) 1998-2006 the VideoLAN team
* Copyright (C) 1998-2007 the VideoLAN team
* $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
......@@ -654,6 +654,7 @@ float VLC_SpeedSlower( int i_object )
*/
int VLC_PlaylistIndex( int i_object )
{
(void)i_object;
printf( "This function is deprecated and should not be used anymore" );
return -1;
}
......
src/misc/configuration.c
View file @ 0e39834a
/*****************************************************************************
* configuration.c management of the modules configuration
*****************************************************************************
* Copyright (C) 2001-2004 the VideoLAN team
* Copyright (C) 2001-2007 the VideoLAN team
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
......@@ -1678,6 +1678,7 @@ const char *config_GetDataDir( const vlc_object_t *p_this )
}
return path;
#else
(void)p_this;
return DATA_PATH;
#endif
}
......@@ -1693,10 +1694,6 @@ static char *GetDir( vlc_bool_t b_appdata )
{
const char *psz_localhome = NULL;
#if defined(HAVE_GETPWUID)
struct passwd *p_pw = NULL;
#endif
#if defined(WIN32) && !defined(UNDER_CE)
typedef HRESULT (WINAPI *SHGETFOLDERPATH)( HWND, int, HANDLE, DWORD,
LPWSTR );
......@@ -1753,6 +1750,9 @@ static char *GetDir( vlc_bool_t b_appdata )
#endif
#if defined(HAVE_GETPWUID)
struct passwd *p_pw;
(void)b_appdata;
if( ( p_pw = getpwuid( getuid() ) ) == NULL )
#endif
{
......
src/misc/image.c
View file @ 0e39834a
......@@ -600,6 +600,7 @@ static picture_t *video_new_buffer( decoder_t *p_dec )
static void video_del_buffer( decoder_t *p_dec, picture_t *p_pic )
{
(void)p_dec;
if( p_pic && p_pic->p_data_orig ) free( p_pic->p_data_orig );
if( p_pic && p_pic->p_sys ) free( p_pic->p_sys );
if( p_pic ) free( p_pic );
......@@ -607,10 +608,12 @@ static void video_del_buffer( decoder_t *p_dec, picture_t *p_pic )
static void video_link_picture( decoder_t *p_dec, picture_t *p_pic )
{
(void)p_dec; (void)p_pic;
}
static void video_unlink_picture( decoder_t *p_dec, picture_t *p_pic )
{
(void)p_dec; (void)p_pic;
}
static decoder_t *CreateDecoder( vlc_object_t *p_this, video_format_t *fmt )
......
src/misc/modules.c
View file @ 0e39834a
/*****************************************************************************
* modules.c : Builtin and plugin modules management functions
*****************************************************************************
* Copyright (C) 2001-2004 the VideoLAN team
* Copyright (C) 2001-2007 the VideoLAN team
* $Id$
*
* Authors: Sam Hocevar <sam@zoy.org>
......@@ -2212,6 +2212,7 @@ static void CacheMerge( vlc_object_t *p_this, module_t *p_cache,
module_t *p_module )
{
int i_submodule;
(void)p_this;
p_cache->pf_activate = p_module->pf_activate;
p_cache->pf_deactivate = p_module->pf_deactivate;
......
src/misc/objects.c
View file @ 0e39834a
/*****************************************************************************
* objects.c: vlc_object_t handling
*****************************************************************************
* Copyright (C) 2004 the VideoLAN team
* Copyright (C) 2004-2007 the VideoLAN team
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
......@@ -774,6 +774,7 @@ vlc_list_t * __vlc_list_find( vlc_object_t *p_this, int i_type, int i_mode )
static int DumpCommand( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
(void)oldval; (void)p_data;
if( *psz_cmd == 'l' )
{
vlc_mutex_lock( &structure_lock );
......
src/misc/stats.c
View file @ 0e39834a
......@@ -56,6 +56,7 @@ counter_t * __stats_CounterCreate( vlc_object_t *p_this,
int i_type, int i_compute_type )
{
counter_t *p_counter = (counter_t*) malloc( sizeof( counter_t ) ) ;
(void)p_this;
p_counter->i_compute_type = i_compute_type;
p_counter->i_type = i_type;
......
src/misc/threads.c
View file @ 0e39834a
/*****************************************************************************
* threads.c : threads implementation for the VideoLAN client
*****************************************************************************
* Copyright (C) 1999-2004 the VideoLAN team
* Copyright (C) 1999-2007 the VideoLAN team
* $Id$
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* Gildas Bazin <gbazin@netcourrier.com>
* Clément Sténac
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -174,6 +175,7 @@ int __vlc_threads_init( vlc_object_t *p_this )
*****************************************************************************/
int __vlc_threads_end( vlc_object_t *p_this )
{
(void)p_this;
#if defined( PTH_INIT_IN_PTH_H )
#elif defined( ST_INIT_IN_ST_H )
#elif defined( UNDER_CE )
......@@ -510,6 +512,7 @@ int __vlc_cond_destroy( const char * psz_file, int i_line, vlc_cond_t *p_condvar
int __vlc_threadvar_create( vlc_object_t *p_this, vlc_threadvar_t *p_tls )
{
int i_ret;
(void)p_this;
#if defined( PTH_INIT_IN_PTH_H )
i_ret = pth_key_create( &p_tls->handle, NULL );
#elif defined( HAVE_KERNEL_SCHEDULER_H )
......
src/network/acl.c
View file @ 0e39834a
/*****************************************************************************
* acl.c:
*****************************************************************************
* Copyright (C) 2005 Rémi Denis-Courmont
* Copyright © 2005-2007 Rémi Denis-Courmont
* $Id$
*
* Authors: Rémi Denis-Courmont <rem # videolan.org>
......@@ -343,11 +343,13 @@ int ACL_LoadFile( vlc_acl_t *p_acl, const char *psz_path )
psz_path);
do
{
fgets( line, sizeof( line ), file );
if( ferror( file ) || feof( file ) )
if( fgets( line, sizeof( line ), file ) == NULL )
{
if( ferror( file ) )
{
msg_Err( p_acl->p_owner, "error reading %s : %s\n",
psz_path, strerror( errno ) );
}
goto error;
}
}
......
src/network/httpd.c
View file @ 0e39834a
......@@ -2,6 +2,7 @@
* httpd.c
*****************************************************************************
* Copyright (C) 2004-2006 the VideoLAN team
* Copyright © 2004-2007 Rémi Denis-Courmont
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
......@@ -646,6 +647,7 @@ static int httpd_RedirectCallBack( httpd_callback_sys_t *p_sys,
{
httpd_redirect_t *rdir = (httpd_redirect_t*)p_sys;
char *p_body;
(void)cl;
if( answer == NULL || query == NULL )
{
......
src/network/tls.c
View file @ 0e39834a
/*****************************************************************************
* tls.c
*****************************************************************************
* Copyright (C) 2004-2005 the VideoLAN team
* Copyright © 2004-2007 Rémi Denis-Courmont
* $Id$
*
* Authors: Rémi Denis-Courmont <rem # videolan.org>
......
src/osd/osd.c
View file @ 0e39834a
......@@ -567,6 +567,7 @@ void __osd_MenuDown( vlc_object_t *p_this )
static int osd_VolumeStep( vlc_object_t *p_this, int i_volume, int i_steps )
{
int i_volume_step = 0;
(void)i_steps;
i_volume_step = config_GetInt( p_this->p_libvlc, "volume-step" );
return (i_volume/i_volume_step);
......
src/osd/osd_text.c
View file @ 0e39834a
/*****************************************************************************
* osd_text.c : text manipulation functions
*****************************************************************************
* Copyright (C) 1999-2005 the VideoLAN team
* Copyright (C) 1999-2007 the VideoLAN team
* $Id$
*
* Author: Sigmund Augdal Helberg <dnumgis@videolan.org>
......@@ -70,6 +70,7 @@ int osd_ShowTextAbsolute( spu_t *p_spu_channel, int i_channel,
{
subpicture_t *p_spu;
video_format_t fmt;
(void)p_style;
if( !psz_string ) return VLC_EGENERIC;
......
src/osd/osd_widgets.c
View file @ 0e39834a
/*****************************************************************************
* osd_widgets.c : OSD widgets manipulation functions
*****************************************************************************
* Copyright (C) 2004-2005 the VideoLAN team
* Copyright (C) 2004-2007 the VideoLAN team
* $Id$
*
* Author: Yoann Peronneau <yoann@videolan.org>
......@@ -217,6 +217,7 @@ int osd_Slider( vlc_object_t *p_this, spu_t *p_spu,
{
subpicture_t *p_subpic;
int i_x_margin, i_y_margin, i_x, i_y, i_width, i_height;
(void)p_this;
p_subpic = osd_CreateWidget( p_spu, i_channel );
if( p_subpic == NULL )
......@@ -279,6 +280,7 @@ int osd_Icon( vlc_object_t *p_this, spu_t *p_spu,
{
subpicture_t *p_subpic;
int i_x_margin, i_y_margin, i_x, i_y, i_width, i_height;
(void)p_this;
p_subpic = osd_CreateWidget( p_spu, i_channel );
if( p_subpic == NULL )
......
src/playlist/engine.c
View file @ 0e39834a
/*****************************************************************************
* engine.c : Run the playlist and handle its control
*****************************************************************************
* Copyright (C) 1999-2004 the VideoLAN team
* Copyright (C) 1999-2007 the VideoLAN team
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
......@@ -38,6 +38,8 @@ static void VariablesInit( playlist_t *p_playlist );
static int RandomCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *a )
{
(void)psz_cmd; (void)oldval; (void)newval; (void)a;
((playlist_t*)p_this)->b_reset_currently_playing = VLC_TRUE;
playlist_Signal( ((playlist_t*)p_this) );
return VLC_SUCCESS;
......
src/playlist/item.c
View file @ 0e39834a
/*****************************************************************************
* item.c : Playlist item creation/deletion/add/removal functions
*****************************************************************************
* Copyright (C) 1999-2004 the VideoLAN team
* Copyright (C) 1999-2007 the VideoLAN team
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
......@@ -408,6 +408,8 @@ static int TreeMove( playlist_t *p_playlist, playlist_item_t *p_item,
{
int j;
playlist_item_t *p_detach = p_item->p_parent;
(void)p_playlist;
if( p_node->i_children == -1 ) return VLC_EGENERIC;
for( j = 0; j < p_detach->i_children; j++ )
......
src/playlist/sort.c
View file @ 0e39834a
/*****************************************************************************
* sort.c : Playlist sorting functions
*****************************************************************************
* Copyright (C) 1999-2004 the VideoLAN team
* Copyright (C) 1999-2007 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
......@@ -84,6 +84,8 @@ static int playlist_ItemArraySort( playlist_t *p_playlist, int i_items,
vlc_value_t val;
val.b_bool = VLC_TRUE;
(void)p_playlist; // a bit surprising we don't need p_playlist!
if( i_mode == SORT_RANDOM )
{
for( i_position = 0; i_position < i_items ; i_position ++ )
......
src/playlist/tree.c
View file @ 0e39834a
/*****************************************************************************
* tree.c : Playlist tree walking functions
*****************************************************************************
* Copyright (C) 1999-2004 the VideoLAN team
* Copyright (C) 1999-2007 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
......@@ -187,6 +187,7 @@ int playlist_NodeInsert( playlist_t *p_playlist,
playlist_item_t *p_parent,
int i_position )
{
(void)p_playlist;
assert( p_parent && p_parent->i_children != -1 );
if( i_position == -1 ) i_position = p_parent->i_children ;
......@@ -210,8 +211,9 @@ int playlist_NodeRemoveItem( playlist_t *p_playlist,
playlist_item_t *p_item,
playlist_item_t *p_parent )
{
int i;
for( i= 0; i< p_parent->i_children ; i++ )
(void)p_playlist;
for(int i= 0; i< p_parent->i_children ; i++ )
{
if( p_parent->pp_children[i] == p_item )
{
......@@ -526,6 +528,8 @@ playlist_item_t *GetNextUncle( playlist_t *p_playlist, playlist_item_t *p_item,
playlist_item_t *p_grandparent;
vlc_bool_t b_found = VLC_FALSE;
(void)p_playlist;
if( p_parent != NULL )
{
p_grandparent = p_parent->p_parent;
......@@ -570,6 +574,8 @@ playlist_item_t *GetPrevUncle( playlist_t *p_playlist, playlist_item_t *p_item,
playlist_item_t *p_grandparent;
vlc_bool_t b_found = VLC_FALSE;
(void)p_playlist;
if( p_parent != NULL )
{
p_grandparent = p_parent->p_parent;
......
src/stream_output/profiles.c
View file @ 0e39834a
......@@ -377,6 +377,7 @@ void streaming_GuiDescToChain( vlc_object_t *p_obj, sout_chain_t *p_chain,
sout_gui_descr_t *pd )
{
sout_duplicate_t *p_dup = NULL;
(void)p_obj;
/* Clean up the chain */
streaming_ChainClean( p_chain );
......
src/stream_output/sap.c
View file @ 0e39834a
/*****************************************************************************
* sap.c : SAP announce handler
*****************************************************************************
* Copyright (C) 2002-2005 the VideoLAN team
* Copyright (C) 2002-2007 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
......@@ -89,10 +89,10 @@ struct sap_session_t {
* Local prototypes
*****************************************************************************/
static void RunThread( vlc_object_t *p_this);
static int CalculateRate( sap_handler_t *p_sap, sap_address_t *p_address );
static int ComputeRate( sap_address_t *p_address );
static char *SDPGenerate( sap_handler_t *p_sap,
const session_descriptor_t *p_session,
const sap_address_t *p_addr, vlc_bool_t b_ssm );
vlc_bool_t b_ssm );
static int announce_SendSAPAnnounce( sap_handler_t *p_sap,
sap_session_t *p_session );
......@@ -207,7 +207,7 @@ static void RunThread( vlc_object_t *p_this)
{
if( p_sap->pp_addresses[i]->b_enabled == VLC_TRUE )
{
CalculateRate( p_sap, p_sap->pp_addresses[i] );
ComputeRate( p_sap->pp_addresses[i] );
}
}
}
......@@ -444,8 +444,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
/* If needed, build the SDP */
if( p_session->psz_sdp == NULL )
{
p_session->psz_sdp = SDPGenerate( p_sap, p_session,
p_sap_session->p_address, b_ssm );
p_session->psz_sdp = SDPGenerate( p_sap, p_session, b_ssm );
if( p_session->psz_sdp == NULL )
{
vlc_mutex_unlock( &p_sap->object_lock );
......@@ -594,7 +593,7 @@ static int announce_SendSAPAnnounce( sap_handler_t *p_sap,
static char *SDPGenerate( sap_handler_t *p_sap,
const session_descriptor_t *p_session,
const sap_address_t *p_addr, vlc_bool_t b_ssm )
vlc_bool_t b_ssm )
{
char *psz_group, *psz_name, *psz_sdp;
......@@ -636,7 +635,7 @@ static char *SDPGenerate( sap_handler_t *p_sap,
return psz_sdp;
}
static int CalculateRate( sap_handler_t *p_sap, sap_address_t *p_address )
static int ComputeRate( sap_address_t *p_address )
{
uint8_t buffer[SAP_MAX_BUFFER];
ssize_t i_tot = 0;
......
src/video_output/video_output.c
View file @ 0e39834a
......@@ -5,7 +5,7 @@
* It includes functions allowing to open a new thread, send pictures to a
* thread, and destroy a previously oppened video output thread.
*****************************************************************************
* Copyright (C) 2000-2004 the VideoLAN team
* Copyright (C) 2000-2007 the VideoLAN team
* $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
......@@ -1399,11 +1399,12 @@ static void MaskToShift( int *pi_left, int *pi_right, uint32_t i_mask )
* vout_VarCallback: generic callback for intf variables
*****************************************************************************/
int vout_VarCallback( vlc_object_t * p_this, const char * psz_variable,
vlc_value_t old_value, vlc_value_t new_value,
void * unused )
vlc_value_t oldval, vlc_value_t newval,
void *p_data )
{
vout_thread_t * p_vout = (vout_thread_t *)p_this;
vlc_value_t val;
(void)psz_variable; (void)newval; (void)oldval; (void)p_data;
val.b_bool = VLC_TRUE;
var_Set( p_vout, "intf-change", val );
return VLC_SUCCESS;
......@@ -1458,6 +1459,7 @@ static int DeinterlaceCallback( vlc_object_t *p_this, char const *psz_cmd,
char *psz_mode = newval.psz_string;
char *psz_filter, *psz_deinterlace = NULL;
(void)psz_cmd; (void)oldval; (void)p_data;
var_Get( p_vout, "vout-filter", &val );
psz_filter = val.psz_string;
......@@ -1509,6 +1511,7 @@ static int FilterCallback( vlc_object_t *p_this, char const *psz_cmd,
vout_thread_t *p_vout = (vout_thread_t *)p_this;
input_thread_t *p_input;
vlc_value_t val;
(void)psz_cmd; (void)oldval; (void)p_data;
p_input = (input_thread_t *)vlc_object_find( p_this, VLC_OBJECT_INPUT,
FIND_PARENT );
......@@ -1595,6 +1598,7 @@ static int VideoFilter2Callback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
(void)psz_cmd; (void)oldval; (void)p_data;
vlc_mutex_lock( &p_vout->vfilter_lock );
ParseVideoFilter2Chain( p_vout, newval.psz_string );
......
src/video_output/video_text.c
View file @ 0e39834a
/*****************************************************************************
* video_text.c : text manipulation functions
*****************************************************************************
* Copyright (C) 1999-2004 the VideoLAN team
* Copyright (C) 1999-2007 the VideoLAN team
* $Id$
*
* Author: Sigmund Augdal Helberg <dnumgis@videolan.org>
......@@ -65,12 +65,13 @@ int vout_ShowTextRelative( vout_thread_t *p_vout, int i_channel,
* is about to be shown
*/
int vout_ShowTextAbsolute( vout_thread_t *p_vout, int i_channel,
char *psz_string, text_style_t *p_style,
const char *psz_string, text_style_t *p_style,
int i_flags, int i_hmargin, int i_vmargin,
mtime_t i_start, mtime_t i_stop )
{
subpicture_t *p_spu;
video_format_t fmt;
(void)p_style; // FIXME: <-- why ask for this if it's unused?!?
if( !psz_string ) return VLC_EGENERIC;
......@@ -116,7 +117,7 @@ int vout_ShowTextAbsolute( vout_thread_t *p_vout, int i_channel,
* \param psz_format printf style formatting
**/
void __vout_OSDMessage( vlc_object_t *p_caller, int i_channel,
char *psz_format, ... )
const char *psz_format, ... )
{
vout_thread_t *p_vout;
char *psz_string;
......
src/video_output/vout_intf.c
View file @ 0e39834a
/*****************************************************************************
* vout_intf.c : video output interface
*****************************************************************************
* Copyright (C) 2000-2006 the VideoLAN team
* Copyright (C) 2000-2007 the VideoLAN team
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
......@@ -792,6 +792,7 @@ void vout_EnableFilter( vout_thread_t *p_vout, char *psz_name,
*****************************************************************************/
int vout_vaControlDefault( vout_thread_t *p_vout, int i_query, va_list args )
{
(void)args;
switch( i_query )
{
case VOUT_REPARENT:
......@@ -894,6 +895,7 @@ static int ZoomCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
(void)psz_cmd; (void)oldval; (void)newval; (void)p_data;
InitWindowSize( p_vout, &p_vout->i_window_width,
&p_vout->i_window_height );
vout_Control( p_vout, VOUT_SET_SIZE, p_vout->i_window_width,
......@@ -908,6 +910,8 @@ static int CropCallback( vlc_object_t *p_this, char const *psz_cmd,
int64_t i_aspect_num, i_aspect_den;
unsigned int i_width, i_height;
(void)oldval; (void)p_data;
/* Restore defaults */
p_vout->fmt_in.i_x_offset = p_vout->fmt_render.i_x_offset;
p_vout->fmt_in.i_visible_width = p_vout->fmt_render.i_visible_width;
......@@ -1057,6 +1061,7 @@ static int AspectCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t val;
char *psz_end, *psz_parser = strchr( newval.psz_string, ':' );
(void)psz_cmd; (void)oldval; (void)p_data;
/* Restore defaults */
p_vout->fmt_in.i_sar_num = p_vout->fmt_render.i_sar_num;
......@@ -1110,6 +1115,7 @@ static int OnTopCallback( vlc_object_t *p_this, char const *psz_cmd,
vout_thread_t *p_vout = (vout_thread_t *)p_this;
playlist_t *p_playlist = pl_Yield( p_this );
vout_Control( p_vout, VOUT_SET_STAY_ON_TOP, newval.b_bool );
(void)psz_cmd; (void)oldval; (void)p_data;
/* Modify playlist as well because the vout might have to be restarted */
var_Create( p_playlist, "video-on-top", VLC_VAR_BOOL );
......@@ -1125,6 +1131,7 @@ static int FullscreenCallback( vlc_object_t *p_this, char const *psz_cmd,
vout_thread_t *p_vout = (vout_thread_t *)p_this;
vlc_value_t val;
playlist_t *p_playlist = pl_Yield( p_this );
(void)psz_cmd; (void)oldval; (void)p_data;
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
......@@ -1149,5 +1156,6 @@ static int SnapshotCallback( vlc_object_t *p_this, char const *psz_cmd,
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
vout_Control( p_vout, VOUT_SNAPSHOT );
(void)psz_cmd; (void)oldval; (void)newval; (void)p_data;
return VLC_SUCCESS;
}
src/video_output/vout_subpictures.c
View file @ 0e39834a
/*****************************************************************************
* vout_subpictures.c : subpicture management functions
*****************************************************************************
* Copyright (C) 2000-2005 the VideoLAN team
* Copyright (C) 2000-2007 the VideoLAN team
* $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
......@@ -320,6 +320,7 @@ subpicture_region_t *__spu_MakeRegion( vlc_object_t *p_this,
picture_t *p_pic )
{
subpicture_region_t *p_region = malloc( sizeof(subpicture_region_t) );
(void)p_this;
memset( p_region, 0, sizeof(subpicture_region_t) );
p_region->p_next = 0;
p_region->p_cache = 0;
......@@ -1079,6 +1080,7 @@ static void UpdateSPU( spu_t *p_spu, vlc_object_t *p_object )
static int CropCallback( vlc_object_t *p_object, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
(void)psz_var; (void)oldval; (void)newval;
UpdateSPU( (spu_t *)p_data, p_object );
return VLC_SUCCESS;
}
......@@ -1103,6 +1105,7 @@ static void sub_del_buffer( filter_t *p_filter, subpicture_t *p_subpic )
static subpicture_t *spu_new_buffer( filter_t *p_filter )
{
subpicture_t *p_subpic = (subpicture_t *)malloc(sizeof(subpicture_t));
(void)p_filter;
memset( p_subpic, 0, sizeof(subpicture_t) );
p_subpic->b_absolute = VLC_TRUE;
......@@ -1147,6 +1150,7 @@ static picture_t *spu_new_video_buffer( filter_t *p_filter )
static void spu_del_video_buffer( filter_t *p_filter, picture_t *p_pic )
{
(void)p_filter;
if( p_pic && p_pic->p_data_orig ) free( p_pic->p_data_orig );
if( p_pic ) free( p_pic );
}
......@@ -1154,6 +1158,8 @@ static void spu_del_video_buffer( filter_t *p_filter, picture_t *p_pic )
static int SubFilterCallback( vlc_object_t *p_object, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
(void)p_object; (void)oldval; (void)newval;
if( !strcmp( psz_var, "sub-filter" ) )
{
spu_t *p_spu = (spu_t *)p_data;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment