From 80fde19dfe7b9e5875e0f891fe29aa0f6c0ec82e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20Stenac?= Date: Sun, 24 Dec 2006 14:18:21 +0000 Subject: [PATCH] More cleanup --- modules/access/dvb/en50221.c | 3 ++- modules/access/dvb/linux_dvb.c | 4 ++-- modules/codec/ffmpeg/audio.c | 2 +- modules/control/gestures.c | 5 +++-- modules/control/hotkeys.c | 17 ++++++++++------- modules/control/http/util.c | 2 +- modules/control/motion.c | 2 +- modules/control/rc.c | 4 ++-- modules/control/telnet.c | 11 ++++++----- modules/demux/asf/libasf.c | 2 +- modules/demux/avi/libavi.c | 2 +- modules/demux/mp4/libmp4.c | 6 +++--- modules/demux/ts.c | 2 +- modules/misc/dummy/aout.c | 2 ++ modules/misc/dummy/decoder.c | 2 ++ modules/misc/dummy/encoder.c | 1 + modules/misc/dummy/input.c | 2 ++ modules/misc/dummy/interface.c | 2 ++ modules/misc/dummy/renderer.c | 2 ++ modules/misc/dummy/vout.c | 2 ++ modules/misc/logger.c | 4 ++-- modules/mux/mpeg/csa.c | 2 +- modules/packetizer/mpeg4audio.c | 3 ++- modules/stream_out/standard.c | 2 +- modules/video_filter/motiondetect.c | 3 +-- 25 files changed, 54 insertions(+), 35 deletions(-) diff --git a/modules/access/dvb/en50221.c b/modules/access/dvb/en50221.c index 304bec8690..9c3f7ee6f8 100644 --- a/modules/access/dvb/en50221.c +++ b/modules/access/dvb/en50221.c @@ -2310,7 +2310,8 @@ void E_(en50221_End)( access_t * p_access ) static char *dvbsi_to_utf8( char *psz_instring, size_t i_length ) { - char *psz_encoding, *psz_stringstart, *psz_outstring, *psz_tmp; + const char *psz_encoding; + char *psz_stringstart, *psz_outstring, *psz_tmp; char psz_encbuf[12]; size_t i_in, i_out; vlc_iconv_t iconv_handle; diff --git a/modules/access/dvb/linux_dvb.c b/modules/access/dvb/linux_dvb.c index 8fdf44d56a..81fc0cebc8 100644 --- a/modules/access/dvb/linux_dvb.c +++ b/modules/access/dvb/linux_dvb.c @@ -118,8 +118,8 @@ int E_(FrontendOpen)( access_t *p_access ) if( b_probe ) { - char * psz_expected = NULL; - char * psz_real; + const char * psz_expected = NULL; + const char * psz_real; if( FrontendInfo( p_access ) < 0 ) { diff --git a/modules/codec/ffmpeg/audio.c b/modules/codec/ffmpeg/audio.c index 0dfb361d4b..0153a0c741 100644 --- a/modules/codec/ffmpeg/audio.c +++ b/modules/codec/ffmpeg/audio.c @@ -166,7 +166,7 @@ int E_(InitAudioDec)( decoder_t *p_dec, AVCodecContext *p_context, * SplitBuffer: Needed because aout really doesn't like big audio chunk and * wma produces easily > 30000 samples... *****************************************************************************/ -aout_buffer_t *SplitBuffer( decoder_t *p_dec ) +static aout_buffer_t *SplitBuffer( decoder_t *p_dec ) { decoder_sys_t *p_sys = p_dec->p_sys; int i_samples = __MIN( p_sys->i_samples, 4096 ); diff --git a/modules/control/gestures.c b/modules/control/gestures.c index 260186f943..0eade43698 100644 --- a/modules/control/gestures.c +++ b/modules/control/gestures.c @@ -83,8 +83,9 @@ static void RunIntf ( intf_thread_t *p_intf ); #define BUTTON_LONGTEXT N_( \ "Trigger button for mouse gestures." ) -static char *button_list[] = { "left", "middle", "right" }; -static char *button_list_text[] = { N_("Left"), N_("Middle"), N_("Right") }; +static const char *button_list[] = { "left", "middle", "right" }; +static const char *button_list_text[] = + { N_("Left"), N_("Middle"), N_("Right") }; vlc_module_begin(); set_shortname( _("Gestures")); diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c index b14f253fa9..4d10ed7c30 100644 --- a/modules/control/hotkeys.c +++ b/modules/control/hotkeys.c @@ -658,7 +658,8 @@ static void Run( intf_thread_t *p_intf ) i_delay -= 50000; /* 50 ms */ var_SetTime( p_input, "spu-delay", i_delay ); ClearChannels( p_intf, p_vout ); - vout_OSDMessage( p_intf, DEFAULT_CHAN, "Subtitle delay %i ms", + vout_OSDMessage( p_intf, DEFAULT_CHAN, + _( "Subtitle delay %i ms" ), (int)(i_delay/1000) ); } else if( i_action == ACTIONID_SUBDELAY_UP ) @@ -667,7 +668,8 @@ static void Run( intf_thread_t *p_intf ) i_delay += 50000; /* 50 ms */ var_SetTime( p_input, "spu-delay", i_delay ); ClearChannels( p_intf, p_vout ); - vout_OSDMessage( p_intf, DEFAULT_CHAN, "Subtitle delay %i ms", + vout_OSDMessage( p_intf, DEFAULT_CHAN, + _( "Subtitle delay %i ms" ), (int)(i_delay/1000) ); } else if( i_action == ACTIONID_AUDIODELAY_DOWN ) @@ -676,7 +678,8 @@ static void Run( intf_thread_t *p_intf ) i_delay -= 50000; /* 50 ms */ var_SetTime( p_input, "audio-delay", i_delay ); ClearChannels( p_intf, p_vout ); - vout_OSDMessage( p_intf, DEFAULT_CHAN, "Audio delay %i ms", + vout_OSDMessage( p_intf, DEFAULT_CHAN, + _( "Audio delay %i ms" ), (int)(i_delay/1000) ); } else if( i_action == ACTIONID_AUDIODELAY_UP ) @@ -685,7 +688,8 @@ static void Run( intf_thread_t *p_intf ) i_delay += 50000; /* 50 ms */ var_SetTime( p_input, "audio-delay", i_delay ); ClearChannels( p_intf, p_vout ); - vout_OSDMessage( p_intf, DEFAULT_CHAN, "Audio delay %i ms", + vout_OSDMessage( p_intf, DEFAULT_CHAN, + _( "Audio delay %i ms" ), (int)(i_delay/1000) ); } else if( i_action == ACTIONID_PLAY ) @@ -788,7 +792,6 @@ static int ActionKeyCB( vlc_object_t *p_this, char const *psz_var, static void PlayBookmark( intf_thread_t *p_intf, int i_num ) { vlc_value_t val; - int i; char psz_bookmark_name[11]; playlist_t *p_playlist = pl_Yield( p_intf ); @@ -848,7 +851,7 @@ static void DisplayPosition( intf_thread_t *p_intf, vout_thread_t *p_vout, if( time.i_time > 0 ) { secstotimestr( psz_duration, time.i_time / 1000000 ); - vout_OSDMessage( p_input, POSITION_TEXT_CHAN, "%s / %s", + vout_OSDMessage( p_input, POSITION_TEXT_CHAN, (char *) "%s / %s", psz_time, psz_duration ); } else if( i_seconds > 0 ) @@ -880,7 +883,7 @@ static void DisplayVolume( intf_thread_t *p_intf, vout_thread_t *p_vout, } else { - vout_OSDMessage( p_vout, VOLUME_TEXT_CHAN, "Volume %d%%", + vout_OSDMessage( p_vout, VOLUME_TEXT_CHAN, _( "Volume %d%%" ), i_vol*400/AOUT_VOLUME_MAX ); } } diff --git a/modules/control/http/util.c b/modules/control/http/util.c index 8b53022f5f..7eebbfd1de 100644 --- a/modules/control/http/util.c +++ b/modules/control/http/util.c @@ -206,7 +206,7 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root, continue; sprintf( dir, "%s%c%s", psz_dir, sep, psz_filename ); - free( psz_filename ); + free( (char*) psz_filename ); if( E_(ParseDirectory)( p_intf, psz_root, dir ) ) { diff --git a/modules/control/motion.c b/modules/control/motion.c index eb8f5d2f97..98f53edcfe 100644 --- a/modules/control/motion.c +++ b/modules/control/motion.c @@ -150,7 +150,7 @@ static void RunIntf( intf_thread_t *p_intf ) #define LOW_THRESHOLD 80 #define HIGH_THRESHOLD 100 vout_thread_t *p_vout; - char *psz_filter, *psz_type; + const char *psz_filter, *psz_type; vlc_bool_t b_change = VLC_FALSE; /* Wait a bit, get orientation, change filter if necessary */ diff --git a/modules/control/rc.c b/modules/control/rc.c index 4897d4c8cc..7d419d2589 100644 --- a/modules/control/rc.c +++ b/modules/control/rc.c @@ -1181,7 +1181,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, || !strcmp( psz_cmd, "vtrack" ) || !strcmp( psz_cmd, "strack" ) ) { - char *psz_variable; + const char *psz_variable; vlc_value_t val_name; int i_error; @@ -1475,7 +1475,7 @@ static int Other( vlc_object_t *p_this, char const *psz_cmd, "mosaic-offsets\0" "mosaic-keep-aspect-ratio\0" "logo-file\0" "logo-x\0" "logo-y\0" "logo-position\0" "logo-transparency\0"; - const char *psz_name; + const char *psz_name = NULL; if( newval.psz_string ) for( psz_name = vars; *psz_name; psz_name += strlen( psz_name ) + 1 ) diff --git a/modules/control/telnet.c b/modules/control/telnet.c index 50e660a5aa..3dcbc8cff5 100644 --- a/modules/control/telnet.c +++ b/modules/control/telnet.c @@ -269,7 +269,8 @@ static void Run( intf_thread_t *p_intf ) cl->fd = fd; cl->buffer_write = NULL; cl->p_buffer_write = cl->buffer_write; - Write_message( cl, NULL, "Password: \xff\xfb\x01", WRITE_MODE_PWD ); + Write_message( cl, NULL, + _( "Password: \xff\xfb\x01" ), WRITE_MODE_PWD ); TAB_APPEND( p_sys->i_clients, p_sys->clients, cl ); } @@ -376,7 +377,7 @@ static void Run( intf_thread_t *p_intf ) if( cl->p_buffer_read - cl->buffer_read == 999 ) { - Write_message( cl, NULL, "Line too long\r\n", + Write_message( cl, NULL, _( "Line too long\r\n" ), cl->i_mode + 2 ); } @@ -406,14 +407,14 @@ static void Run( intf_thread_t *p_intf ) *cl->p_buffer_read = '\0'; if( strcmp( psz_password, cl->buffer_read ) == 0 ) { - Write_message( cl, NULL, "\xff\xfc\x01\r\nWelcome, " - "Master\r\n> ", WRITE_MODE_CMD ); + Write_message( cl, NULL, _( "\xff\xfc\x01\r\nWelcome, " + "Master\r\n> " ), WRITE_MODE_CMD ); } else { /* wrong password */ Write_message( cl, NULL, - "\r\nWrong password.\r\nPassword: ", + _( "\r\nWrong password.\r\nPassword: " ), WRITE_MODE_PWD ); } } diff --git a/modules/demux/asf/libasf.c b/modules/demux/asf/libasf.c index c9244984c0..ce4630ae77 100644 --- a/modules/demux/asf/libasf.c +++ b/modules/demux/asf/libasf.c @@ -1363,7 +1363,7 @@ static void ASF_FreeObject( stream_t *s, asf_object_t *p_obj ) static const struct { const guid_t *p_id; - char *psz_name; + const char *psz_name; } ASF_ObjectDumpDebugInfo[] = { { &asf_object_header_guid, "Header" }, diff --git a/modules/demux/avi/libavi.c b/modules/demux/avi/libavi.c index aef8c8b007..b8c234cd62 100644 --- a/modules/demux/avi/libavi.c +++ b/modules/demux/avi/libavi.c @@ -566,7 +566,7 @@ static void AVI_ChunkFree_indx( avi_chunk_t *p_chk ) static struct { vlc_fourcc_t i_fourcc; - char *psz_type; + const char *psz_type; } AVI_strz_type[] = { { AVIFOURCC_IARL, "archive location" }, diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c index 49a38c0e26..4f9c44af35 100644 --- a/modules/demux/mp4/libmp4.c +++ b/modules/demux/mp4/libmp4.c @@ -82,7 +82,7 @@ #define MP4_READBOX_ENTER( MP4_Box_data_TYPE_t ) \ - uint64_t i_read = p_box->i_size; \ + int64_t i_read = p_box->i_size; \ uint8_t *p_peek, *p_buff; \ int i_actually_read; \ if( !( p_peek = p_buff = malloc( i_read ) ) ) \ @@ -90,7 +90,7 @@ return( 0 ); \ } \ i_actually_read = stream_Read( p_stream, p_peek, i_read ); \ - if( i_actually_read < 0 || (uint64_t)i_actually_read < i_read )\ + if( i_actually_read < 0 || (int64_t)i_actually_read < i_read )\ { \ free( p_buff ); \ return( 0 ); \ @@ -2055,7 +2055,7 @@ static int MP4_ReadBox_drms( stream_t *p_stream, MP4_Box_t *p_box ) } if( i_ret ) { - char *psz_error; + const char *psz_error; switch( i_ret ) { diff --git a/modules/demux/ts.c b/modules/demux/ts.c index 1902dcad53..f3d768fca7 100644 --- a/modules/demux/ts.c +++ b/modules/demux/ts.c @@ -388,7 +388,7 @@ static int Open( vlc_object_t *p_this ) int i_packet_size; ts_pid_t *pat; - char *psz_mode; + const char *psz_mode; vlc_bool_t b_append; vlc_bool_t b_topfield = VLC_FALSE; diff --git a/modules/misc/dummy/aout.c b/modules/misc/dummy/aout.c index d8f12abe08..ec738dbc34 100644 --- a/modules/misc/dummy/aout.c +++ b/modules/misc/dummy/aout.c @@ -30,6 +30,8 @@ #include #include +#include "dummy.h" + #define FRAME_SIZE 2048 #define A52_FRAME_NB 1536 diff --git a/modules/misc/dummy/decoder.c b/modules/misc/dummy/decoder.c index b01b38bde6..8f31c72829 100644 --- a/modules/misc/dummy/decoder.c +++ b/modules/misc/dummy/decoder.c @@ -48,6 +48,8 @@ #include /* sprintf() */ +#include "dummy.h" + /***************************************************************************** * decoder_sys_t : theora decoder descriptor *****************************************************************************/ diff --git a/modules/misc/dummy/encoder.c b/modules/misc/dummy/encoder.c index a9f8738977..fc93fd1136 100644 --- a/modules/misc/dummy/encoder.c +++ b/modules/misc/dummy/encoder.c @@ -26,6 +26,7 @@ *****************************************************************************/ #include #include +#include "dummy.h" /***************************************************************************** * Local prototypes diff --git a/modules/misc/dummy/input.c b/modules/misc/dummy/input.c index c9a2c3bc25..a2ee8c5809 100644 --- a/modules/misc/dummy/input.c +++ b/modules/misc/dummy/input.c @@ -33,6 +33,8 @@ #include #include +#include "dummy.h" + /***************************************************************************** * Access functions. *****************************************************************************/ diff --git a/modules/misc/dummy/interface.c b/modules/misc/dummy/interface.c index 08740ca481..abf759763e 100644 --- a/modules/misc/dummy/interface.c +++ b/modules/misc/dummy/interface.c @@ -30,6 +30,8 @@ #include #include +#include "dummy.h" + /***************************************************************************** * Open: initialize dummy interface *****************************************************************************/ diff --git a/modules/misc/dummy/renderer.c b/modules/misc/dummy/renderer.c index 9a4c2cf38c..7e5802995c 100644 --- a/modules/misc/dummy/renderer.c +++ b/modules/misc/dummy/renderer.c @@ -26,6 +26,8 @@ #include #include +#include "dummy.h" + static int RenderText( filter_t *, subpicture_region_t *, subpicture_region_t * ); diff --git a/modules/misc/dummy/vout.c b/modules/misc/dummy/vout.c index d00e8fc199..1c20e40c26 100644 --- a/modules/misc/dummy/vout.c +++ b/modules/misc/dummy/vout.c @@ -34,6 +34,8 @@ #define DUMMY_HEIGHT 16 #define DUMMY_MAX_DIRECTBUFFERS 10 +#include "dummy.h" + /***************************************************************************** * Local prototypes *****************************************************************************/ diff --git a/modules/misc/logger.c b/modules/misc/logger.c index d9431d51a9..f9697e1934 100644 --- a/modules/misc/logger.c +++ b/modules/misc/logger.c @@ -105,12 +105,12 @@ static void DoRRD( intf_thread_t *p_intf ); /***************************************************************************** * Module descriptor *****************************************************************************/ -static char *mode_list[] = { "text", "html" +static const char *mode_list[] = { "text", "html" #ifdef HAVE_SYSLOG_H ,"syslog" #endif }; -static char *mode_list_text[] = { N_("Text"), "HTML" +static const char *mode_list_text[] = { N_("Text"), "HTML" #ifdef HAVE_SYSLOG_H , "syslog" #endif diff --git a/modules/mux/mpeg/csa.c b/modules/mux/mpeg/csa.c index 11fde62450..1206281d61 100644 --- a/modules/mux/mpeg/csa.c +++ b/modules/mux/mpeg/csa.c @@ -59,7 +59,7 @@ static void csa_BlockCypher( uint8_t kk[57], uint8_t bd[8], uint8_t ib[8] ); /***************************************************************************** * csa_New: *****************************************************************************/ -csa_t *csa_New() +csa_t *csa_New( void ) { csa_t *c = malloc( sizeof( csa_t ) ); memset( c, 0, sizeof( csa_t ) ); diff --git a/modules/packetizer/mpeg4audio.c b/modules/packetizer/mpeg4audio.c index f9a7343cd0..f1128f72e1 100644 --- a/modules/packetizer/mpeg4audio.c +++ b/modules/packetizer/mpeg4audio.c @@ -68,7 +68,8 @@ struct decoder_sys_t audio_date_t end_date; mtime_t i_pts; - int i_frame_size, i_raw_blocks; + int i_frame_size; + unsigned int i_raw_blocks; unsigned int i_channels; unsigned int i_rate, i_frame_length, i_header_size; }; diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c index c805146ed6..c928881260 100644 --- a/modules/stream_out/standard.c +++ b/modules/stream_out/standard.c @@ -158,7 +158,7 @@ static int Open( vlc_object_t *p_this ) if( psz_url && strrchr( psz_url, '.' ) ) { /* by extension */ - static struct { char *ext; char *mux; } exttomux[] = + static struct { const char *ext; const char *mux; } exttomux[] = { { "avi", "avi" }, { "ogg", "ogg" }, diff --git a/modules/video_filter/motiondetect.c b/modules/video_filter/motiondetect.c index 26f4edd53f..183356c055 100644 --- a/modules/video_filter/motiondetect.c +++ b/modules/video_filter/motiondetect.c @@ -137,7 +137,6 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_inpic ) const uint8_t *p_inpix_u = p_inpic->p[U_PLANE].p_pixels; const uint8_t *p_inpix_v = p_inpic->p[V_PLANE].p_pixels; const int i_src_pitch_u = p_inpic->p[U_PLANE].i_pitch; - const int i_src_visible_u = p_inpic->p[U_PLANE].i_visible_pitch; const int i_num_lines_u = p_inpic->p[U_PLANE].i_visible_lines; uint8_t *p_oldpix; @@ -257,7 +256,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_inpic ) p_buf2[(2*line+1)*i_src_pitch+2*col+1] += diff; break; - case2: + case 2: p_buf2[line*i_src_pitch+2*col] += diff; p_buf2[line*i_src_pitch+2*col+1] += diff; break; -- 2.39.2