Mercurial > mplayer.hg
changeset 17566:f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
patch replaces '()' for the correct '(void)' in function
declarations/prototypes which have no parameters. The '()' syntax tell
thats there is a variable list of arguments, so that the compiler cannot
check this. The extra CFLAG '-Wstrict-declarations' shows those cases.
Comments about a similar patch applied to ffmpeg:
That in C++ these mean the same, but in ANSI C the semantics are
different; function() is an (obsolete) K&R C style forward declaration,
it basically means that the function can have any number and any types
of parameters, effectively completely preventing the compiler from doing
any sort of type checking. -- Erik Slagter
Defining functions with unspecified arguments is allowed but bad.
With arguments unspecified the compiler can't report an error/warning
if the function is called with incorrect arguments. -- M\ns Rullg\rd
line wrap: on
line diff
--- a/codec-cfg.c Thu Feb 09 10:23:51 2006 +0000 +++ b/codec-cfg.c Thu Feb 09 14:08:03 2006 +0000 @@ -747,7 +747,7 @@ free(codecs); } -void codecs_uninit_free() { +void codecs_uninit_free(void) { if (video_codecs) codecs_free(video_codecs,nr_vcodecs); video_codecs=NULL;
--- a/codec-cfg.h Thu Feb 09 10:23:51 2006 +0000 +++ b/codec-cfg.h Thu Feb 09 14:08:03 2006 +0000 @@ -68,6 +68,6 @@ void select_codec(char* codecname,int audioflag); void list_codecs(int audioflag); void codecs_reset_selection(int audioflag); -void codecs_uninit_free(); +void codecs_uninit_free(void); #endif
--- a/cpudetect.c Thu Feb 09 10:23:51 2006 +0000 +++ b/cpudetect.c Thu Feb 09 14:08:03 2006 +0000 @@ -45,7 +45,7 @@ #if 1 // return TRUE if cpuid supported -static int has_cpuid() +static int has_cpuid(void) { long a, c;
--- a/divx4_vbr.c Thu Feb 09 10:23:51 2006 +0000 +++ b/divx4_vbr.c Thu Feb 09 14:08:03 2006 +0000 @@ -316,17 +316,17 @@ return 0; } -int VbrControl_get_intra() +int VbrControl_get_intra(void) { return m_vFrames[m_iCount].is_key_frame; } -short VbrControl_get_drop() +short VbrControl_get_drop(void) { return m_bDrop; } -int VbrControl_get_quant() +int VbrControl_get_quant(void) { return m_iQuant; } @@ -340,7 +340,7 @@ if(m_iQuant>max_quantizer) m_iQuant=max_quantizer; } -void VbrControl_update_1pass_vbr() +void VbrControl_update_1pass_vbr(void) { VbrControl_set_quant(m_fQuant); m_iCount++; @@ -395,7 +395,7 @@ fprintf(m_pFile, ", new quant %d\n", m_iQuant); } -void VbrControl_close() +void VbrControl_close(void) { if(m_pFile) {
--- a/divx4_vbr.h Thu Feb 09 10:23:51 2006 +0000 +++ b/divx4_vbr.h Thu Feb 09 14:08:03 2006 +0000 @@ -5,13 +5,13 @@ int VbrControl_init_2pass_vbr_encoding(const char* filename, int bitrate, double framerate, int crispness, int quality); int VbrControl_init_2pass_vbr_analysis(const char* filename, int quality); - void VbrControl_update_1pass_vbr(); + void VbrControl_update_1pass_vbr(void); void VbrControl_update_2pass_vbr_encoding(int motion_bits, int texture_bits, int total_bits); void VbrControl_update_2pass_vbr_analysis(int is_key_frame, int motion_bits, int texture_bits, int total_bits, int quant); - int VbrControl_get_quant(); + int VbrControl_get_quant(void); void VbrControl_set_quant(float q); - int VbrControl_get_intra(); - short VbrControl_get_drop(); - void VbrControl_close(); + int VbrControl_get_intra(void); + short VbrControl_get_drop(void); + void VbrControl_close(void);
--- a/edl.c Thu Feb 09 10:23:51 2006 +0000 +++ b/edl.c Thu Feb 09 14:08:03 2006 +0000 @@ -54,7 +54,7 @@ * \brief Fills EDL operations queue. */ -edl_record_ptr edl_parse_file() +edl_record_ptr edl_parse_file(void) { FILE *fd; char line[100];
--- a/edl.h Thu Feb 09 10:23:51 2006 +0000 +++ b/edl.h Thu Feb 09 14:08:03 2006 +0000 @@ -24,6 +24,6 @@ extern char *edl_output_filename; // file to put EDL entries in (-edlout) void free_edl(edl_record_ptr next_edl_record); // free's entire EDL list. -edl_record_ptr edl_parse_file(); // fills EDL stack +edl_record_ptr edl_parse_file(void); // fills EDL stack #endif
--- a/liba52/bitstream.c Thu Feb 09 10:23:51 2006 +0000 +++ b/liba52/bitstream.c Thu Feb 09 14:08:03 2006 +0000 @@ -59,7 +59,7 @@ } static inline void -bitstream_fill_current() +bitstream_fill_current(void) { uint32_t tmp;
--- a/libao2/ao_alsa.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libao2/ao_alsa.c Thu Feb 09 14:08:03 2006 +0000 @@ -237,7 +237,7 @@ tmp[0] = ':'; } -static void print_help () +static void print_help (void) { mp_msg (MSGT_AO, MSGL_FATAL, "\n-ao alsa commandline help:\n" @@ -725,7 +725,7 @@ } } -static void audio_pause() +static void audio_pause(void) { int err; @@ -745,7 +745,7 @@ } } -static void audio_resume() +static void audio_resume(void) { int err; @@ -766,7 +766,7 @@ } /* stop playing and empty buffers (for seeking/pause) */ -static void reset() +static void reset(void) { int err; @@ -1030,7 +1030,7 @@ } /* how many byes are free in the buffer */ -static int get_space() +static int get_space(void) { snd_pcm_status_t *status; int ret; @@ -1100,7 +1100,7 @@ } /* delay in seconds between first and last sample in buffer */ -static float get_delay() +static float get_delay(void) { if (alsa_handler) {
--- a/libao2/ao_arts.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libao2/ao_arts.c Thu Feb 09 14:08:03 2006 +0000 @@ -112,24 +112,24 @@ return arts_write(stream, data, len); } -static void audio_pause() +static void audio_pause(void) { } -static void audio_resume() +static void audio_resume(void) { } -static void reset() +static void reset(void) { } -static int get_space() +static int get_space(void) { return arts_stream_get(stream, ARTS_P_BUFFER_SPACE); } -static float get_delay() +static float get_delay(void) { return ((float) (ao_data.buffersize - arts_stream_get(stream, ARTS_P_BUFFER_SPACE))) / ((float) ao_data.bps);
--- a/libao2/ao_esd.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libao2/ao_esd.c Thu Feb 09 14:08:03 2006 +0000 @@ -346,7 +346,7 @@ /* * stop playing, keep buffers (for pause) */ -static void audio_pause() +static void audio_pause(void) { /* * not possible with esd. the esd daemom will continue playing @@ -358,7 +358,7 @@ /* * resume playing, after audio_pause() */ -static void audio_resume() +static void audio_resume(void) { /* * not possible with esd. @@ -375,7 +375,7 @@ /* * stop playing and empty buffers (for seeking/pause) */ -static void reset() +static void reset(void) { #ifdef __svr4__ /* throw away data buffered in the esd connection */ @@ -388,7 +388,7 @@ /* * return: how many bytes can be played without blocking */ -static int get_space() +static int get_space(void) { struct timeval tmout; fd_set wfds; @@ -432,7 +432,7 @@ /* * return: delay in seconds between first and last sample in buffer */ -static float get_delay() +static float get_delay(void) { struct timeval now; double buffered_samples_time;
--- a/libao2/ao_mpegpes.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libao2/ao_mpegpes.c Thu Feb 09 14:08:03 2006 +0000 @@ -137,19 +137,19 @@ } // stop playing and empty buffers (for seeking/pause) -static void reset(){ +static void reset(void){ } // stop playing, keep buffers (for pause) -static void audio_pause() +static void audio_pause(void) { // for now, just call reset(); reset(); } // resume playing, after audio_pause() -static void audio_resume() +static void audio_resume(void) { } @@ -158,7 +158,7 @@ extern int vo_pts; // return: how many bytes can be played without blocking -static int get_space(){ +static int get_space(void){ float x=(float)(vo_pts-ao_data.pts)/90000.0; int y; // printf("vo_pts: %5.3f ao_pts: %5.3f\n",vo_pts/90000.0,ao_data.pts/90000.0); @@ -189,7 +189,7 @@ } // return: delay in seconds between first and last sample in buffer -static float get_delay(){ +static float get_delay(void){ return 0.0; }
--- a/libao2/ao_nas.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libao2/ao_nas.c Thu Feb 09 14:08:03 2006 +0000 @@ -506,7 +506,7 @@ } // stop playing and empty buffers (for seeking/pause) -static void reset(){ +static void reset(void){ AuStatus as; mp_msg(MSGT_AO, MSGL_DBG3, "ao_nas: reset()\n"); @@ -523,7 +523,7 @@ } // stop playing, keep buffers (for pause) -static void audio_pause() +static void audio_pause(void) { AuStatus as; mp_msg(MSGT_AO, MSGL_DBG3, "ao_nas: audio_pause()\n"); @@ -532,7 +532,7 @@ } // resume playing, after audio_pause() -static void audio_resume() +static void audio_resume(void) { AuStatus as; @@ -546,7 +546,7 @@ // return: how many bytes can be played without blocking -static int get_space() +static int get_space(void) { int result; @@ -597,7 +597,7 @@ } // return: delay in seconds between first and last sample in buffer -static float get_delay() +static float get_delay(void) { float result;
--- a/libao2/ao_null.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libao2/ao_null.c Thu Feb 09 14:08:03 2006 +0000 @@ -20,7 +20,7 @@ struct timeval last_tv; int buffer; -static void drain(){ +static void drain(void){ struct timeval now_tv; int temp, temp2; @@ -70,24 +70,24 @@ } // stop playing and empty buffers (for seeking/pause) -static void reset(){ +static void reset(void){ buffer=0; } // stop playing, keep buffers (for pause) -static void audio_pause() +static void audio_pause(void) { // for now, just call reset(); reset(); } // resume playing, after audio_pause() -static void audio_resume() +static void audio_resume(void) { } // return: how many bytes can be played without blocking -static int get_space(){ +static int get_space(void){ drain(); return ao_data.buffersize - buffer; @@ -106,7 +106,7 @@ } // return: delay in seconds between first and last sample in buffer -static float get_delay(){ +static float get_delay(void){ drain(); return (float) buffer / (float) ao_data.bps;
--- a/libao2/ao_oss.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libao2/ao_oss.c Thu Feb 09 14:08:03 2006 +0000 @@ -423,7 +423,7 @@ } // stop playing and empty buffers (for seeking/pause) -static void reset(){ +static void reset(void){ int oss_format; uninit(1); audio_fd=open(dsp, O_WRONLY); @@ -450,20 +450,20 @@ } // stop playing, keep buffers (for pause) -static void audio_pause() +static void audio_pause(void) { uninit(1); } // resume playing, after audio_pause() -static void audio_resume() +static void audio_resume(void) { reset(); } // return: how many bytes can be played without blocking -static int get_space(){ +static int get_space(void){ int playsize=ao_data.outburst; #ifdef SNDCTL_DSP_GETOSPACE @@ -503,7 +503,7 @@ static int audio_delay_method=2; // return: delay in seconds between first and last sample in buffer -static float get_delay(){ +static float get_delay(void){ /* Calculate how many bytes/second is sent out */ if(audio_delay_method==2){ #ifdef SNDCTL_DSP_GETODELAY
--- a/libao2/ao_pcm.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libao2/ao_pcm.c Thu Feb 09 14:08:03 2006 +0000 @@ -159,24 +159,24 @@ } // stop playing and empty buffers (for seeking/pause) -static void reset(){ +static void reset(void){ } // stop playing, keep buffers (for pause) -static void audio_pause() +static void audio_pause(void) { // for now, just call reset(); reset(); } // resume playing, after audio_pause() -static void audio_resume() +static void audio_resume(void) { } // return: how many bytes can be played without blocking -static int get_space(){ +static int get_space(void){ if(vo_pts) return ao_data.pts < vo_pts ? ao_data.outburst : 0; @@ -210,7 +210,7 @@ } // return: delay in seconds between first and last sample in buffer -static float get_delay(){ +static float get_delay(void){ return 0.0; }
--- a/libao2/ao_sdl.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libao2/ao_sdl.c Thu Feb 09 14:08:03 2006 +0000 @@ -67,7 +67,7 @@ // may only be called by mplayer's thread // return value may change between immediately following two calls, // and the real number of free bytes might be larger! -static int buf_free() { +static int buf_free(void) { int free = read_pos - write_pos - CHUNK_SIZE; if (free < 0) free += BUFFSIZE; return free; @@ -76,7 +76,7 @@ // may only be called by SDL's playback thread // return value may change between immediately following two calls, // and the real number of buffered bytes might be larger! -static int buf_used() { +static int buf_used(void) { int used = write_pos - read_pos; if (used < 0) used += BUFFSIZE; return used; @@ -283,7 +283,7 @@ } // stop playing and empty buffers (for seeking/pause) -static void reset(){ +static void reset(void){ //printf("SDL: reset called!\n"); @@ -295,7 +295,7 @@ } // stop playing, keep buffers (for pause) -static void audio_pause() +static void audio_pause(void) { //printf("SDL: audio_pause called!\n"); @@ -304,7 +304,7 @@ } // resume playing, after audio_pause() -static void audio_resume() +static void audio_resume(void) { //printf("SDL: audio_resume called!\n"); SDL_PauseAudio(0); @@ -312,7 +312,7 @@ // return: how many bytes can be played without blocking -static int get_space(){ +static int get_space(void){ return buf_free(); } @@ -338,7 +338,7 @@ } // return: delay in seconds between first and last sample in buffer -static float get_delay(){ +static float get_delay(void){ int buffered = BUFFSIZE - CHUNK_SIZE - buf_free(); // could be less return (float)(buffered + ao_data.buffersize)/(float)ao_data.bps; }
--- a/libao2/audio_out.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libao2/audio_out.c Thu Feb 09 14:08:03 2006 +0000 @@ -126,7 +126,7 @@ NULL }; -void list_audio_out(){ +void list_audio_out(void){ int i=0; mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AvailableAudioOutputDrivers); if (identify)
--- a/libao2/audio_out.h Thu Feb 09 10:23:51 2006 +0000 +++ b/libao2/audio_out.h Thu Feb 09 14:08:03 2006 +0000 @@ -21,12 +21,12 @@ int (*control)(int cmd,void *arg); int (*init)(int rate,int channels,int format,int flags); void (*uninit)(int immed); - void (*reset)(); - int (*get_space)(); + void (*reset)(void); + int (*get_space)(void); int (*play)(void* data,int len,int flags); - float (*get_delay)(); - void (*pause)(); - void (*resume)(); + float (*get_delay)(void); + void (*pause)(void); + void (*resume)(void); } ao_functions_t; /* global data used by mplayer and plugins */ @@ -44,7 +44,7 @@ extern char *ao_subdevice; extern ao_data_t ao_data; -void list_audio_out(); +void list_audio_out(void); ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate,int channels,int format,int flags); // NULL terminated array of all drivers
--- a/libao2/audio_out_internal.h Thu Feb 09 10:23:51 2006 +0000 +++ b/libao2/audio_out_internal.h Thu Feb 09 14:08:03 2006 +0000 @@ -3,13 +3,13 @@ //static ao_info_t info; static int control(int cmd, void *arg); static int init(int rate,int channels,int format,int flags); -static void uninit(); -static void reset(); -static int get_space(); +static void uninit(int immed); +static void reset(void); +static int get_space(void); static int play(void* data,int len,int flags); -static float get_delay(); -static void audio_pause(); -static void audio_resume(); +static float get_delay(void); +static void audio_pause(void); +static void audio_resume(void); #define LIBAO_EXTERN(x) ao_functions_t audio_out_##x =\ {\
--- a/libfaad2/ps_dec.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libfaad2/ps_dec.c Thu Feb 09 14:08:03 2006 +0000 @@ -159,7 +159,7 @@ /* static function declarations */ static void ps_data_decode(ps_info *ps); -static hyb_info *hybrid_init(); +static hyb_info *hybrid_init(void); static void channel_filter2(hyb_info *hyb, uint8_t frame_len, const real_t *filter, qmf_t *buffer, qmf_t **X_hybrid); static void INLINE DCT3_4_unscaled(real_t *y, real_t *x); @@ -189,7 +189,7 @@ /* */ -static hyb_info *hybrid_init() +static hyb_info *hybrid_init(void) { uint8_t i;
--- a/libmpcodecs/dec_audio.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpcodecs/dec_audio.c Thu Feb 09 14:08:03 2006 +0000 @@ -29,7 +29,7 @@ int audio_output_channels = 2; af_cfg_t af_cfg = {1, NULL}; // Configuration for audio filters -void afm_help(){ +void afm_help(void){ int i; mp_msg(MSGT_DECAUDIO,MSGL_INFO,MSGTR_AvailableAudioFm); if (identify) @@ -434,6 +434,6 @@ ds_fill_buffer(sh_audio->ds); // skip block } -void adjust_volume() +void adjust_volume(void) { }
--- a/libmpcodecs/dec_audio.h Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpcodecs/dec_audio.h Thu Feb 09 14:08:03 2006 +0000 @@ -1,6 +1,6 @@ // dec_audio.c: -extern void afm_help(); +extern void afm_help(void); //extern int init_best_audio_codec(sh_audio_t *sh_audio,char* audio_codec,char* audio_fm); extern int init_audio_codec(sh_audio_t *sh_audio); extern int init_audio(sh_audio_t *sh_audio,char* codecname,char* afm,int status);
--- a/libmpcodecs/dec_video.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpcodecs/dec_video.c Thu Feb 09 14:08:03 2006 +0000 @@ -149,7 +149,7 @@ sh_video->inited=0; } -void vfm_help(){ +void vfm_help(void){ int i; mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_AvailableVideoFm); if (identify)
--- a/libmpcodecs/dec_video.h Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpcodecs/dec_video.h Thu Feb 09 14:08:03 2006 +0000 @@ -2,7 +2,7 @@ // dec_video.c: extern int video_read_properties(sh_video_t *sh_video); -extern void vfm_help(); +extern void vfm_help(void); extern int init_best_video_codec(sh_video_t *sh_video,char** video_codec_list,char** video_fm_list);
--- a/libmpcodecs/native/xa_gsm.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpcodecs/native/xa_gsm.c Thu Feb 09 14:08:03 2006 +0000 @@ -40,7 +40,7 @@ static XA_GSM_STATE gsm_state; -void GSM_Init() +void GSM_Init(void) { memset((char *)(&gsm_state), 0, sizeof(XA_GSM_STATE)); gsm_state.nrp = 40;
--- a/libmpcodecs/native/xa_gsm.h Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpcodecs/native/xa_gsm.h Thu Feb 09 14:08:03 2006 +0000 @@ -1,6 +1,6 @@ void XA_MSGSM_Decoder(unsigned char *ibuf,unsigned short *obuf); void XA_GSM_Decoder(unsigned char *ibuf,unsigned short *obuf); -void GSM_Init(); +void GSM_Init(void);
--- a/libmpcodecs/pullup.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpcodecs/pullup.c Thu Feb 09 14:08:03 2006 +0000 @@ -733,7 +733,7 @@ -struct pullup_context *pullup_alloc_context() +struct pullup_context *pullup_alloc_context(void) { struct pullup_context *c;
--- a/libmpcodecs/pullup.h Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpcodecs/pullup.h Thu Feb 09 14:08:03 2006 +0000 @@ -75,7 +75,7 @@ void pullup_pack_frame(struct pullup_context *c, struct pullup_frame *fr); void pullup_release_frame(struct pullup_frame *fr); -struct pullup_context *pullup_alloc_context(); +struct pullup_context *pullup_alloc_context(void); void pullup_preinit_context(struct pullup_context *c); void pullup_init_context(struct pullup_context *c); void pullup_free_context(struct pullup_context *c);
--- a/libmpcodecs/vf.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpcodecs/vf.c Thu Feb 09 14:08:03 2006 +0000 @@ -701,7 +701,7 @@ } } -void vf_list_plugins(){ +void vf_list_plugins(void){ int i=0; while(filter_list[i]){ mp_msg(MSGT_VFILTER,MSGL_INFO,"\t%-10s: %s\n",filter_list[i]->name,filter_list[i]->info);
--- a/libmpcodecs/vf.h Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpcodecs/vf.h Thu Feb 09 14:08:03 2006 +0000 @@ -101,7 +101,7 @@ vf_instance_t* append_filters(vf_instance_t* last); -void vf_list_plugins(); +void vf_list_plugins(void); void vf_uninit_filter(vf_instance_t* vf); void vf_uninit_filter_chain(vf_instance_t* vf);
--- a/libmpcodecs/vf_pp7.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpcodecs/vf_pp7.c Thu Feb 09 14:08:03 2006 +0000 @@ -212,7 +212,7 @@ static int thres2[99][16]; -static void init_thres2(){ +static void init_thres2(void){ int qp, i; int bias= 0; //FIXME
--- a/libmpcodecs/vf_scale.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpcodecs/vf_scale.c Thu Feb 09 14:08:03 2006 +0000 @@ -492,7 +492,7 @@ float sws_chr_sharpen= 0.0; float sws_lum_sharpen= 0.0; -int get_sws_cpuflags(){ +int get_sws_cpuflags(void){ return (gCpuCaps.hasMMX ? SWS_CPU_CAPS_MMX : 0) | (gCpuCaps.hasMMX2 ? SWS_CPU_CAPS_MMX2 : 0)
--- a/libmpcodecs/vf_scale.h Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpcodecs/vf_scale.h Thu Feb 09 14:08:03 2006 +0000 @@ -1,4 +1,4 @@ //GPL -int get_sws_cpuflags(); +int get_sws_cpuflags(void); struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat);
--- a/libmpcodecs/vf_test.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpcodecs/vf_test.c Thu Feb 09 14:08:03 2006 +0000 @@ -64,7 +64,7 @@ static double c[64]; -static void initIdct() +static void initIdct(void) { int i;
--- a/libmpdemux/cookies.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpdemux/cookies.c Thu Feb 09 14:08:03 2006 +0000 @@ -159,7 +159,7 @@ } /* Attempt to load cookies.txt from various locations. Returns a pointer to the linked list contain the cookies. */ -static struct cookie_list_type *load_cookies() +static struct cookie_list_type *load_cookies(void) { DIR *dir; struct dirent *ent;
--- a/libmpdemux/cue_read.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpdemux/cue_read.c Thu Feb 09 14:08:03 2006 +0000 @@ -268,7 +268,7 @@ return frame + (second + minute * 60 ) * 75; } -static inline int cue_get_msf() { +static inline int cue_get_msf(void) { return cue_msf_2_sector (cue_current_pos.minute, cue_current_pos.second, cue_current_pos.frame); @@ -433,7 +433,7 @@ -static int cue_read_toc_entry() { +static int cue_read_toc_entry(void) { int track = cue_current_pos.track - 1; @@ -480,7 +480,7 @@ return VCD_SECTOR_DATA * cue_get_msf(); } -static void cue_vcd_read_toc(){ +static void cue_vcd_read_toc(void){ int i; for (i = 0; i < nTracks; ++i) {
--- a/libmpdemux/demux_ogg.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpdemux/demux_ogg.c Thu Feb 09 14:08:03 2006 +0000 @@ -221,7 +221,7 @@ return (ret); } -void demux_ogg_init_sub () { +void demux_ogg_init_sub (void) { int lcv; if(!ogg_sub.text[0]) // not yet allocated for (lcv = 0; lcv < SUB_MAX_TEXT; lcv++) {
--- a/libmpdemux/demux_ty_osd.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpdemux/demux_ty_osd.c Thu Feb 09 14:08:03 2006 +0000 @@ -63,7 +63,7 @@ static int tyOSDInited = 0; static int tyOSDUpdate = 0; -static void ty_DrawOSD() +static void ty_DrawOSD(void) { // printf( "Calling ty_DrawOSD()\n" ); tyOSDUpdate = 1; @@ -161,7 +161,7 @@ *( TY_CC_ptr++ ) = ( c == 14 ) ? '/' : c; // swap a '/' for musical note } -static void ty_draw() +static void ty_draw(void) { if ( TY_CC_ptr != TY_CC_buf && TY_OSD_flags & TY_TEXT_MODE ) { @@ -513,7 +513,7 @@ } -static void ty_DisplayXDSInfo() +static void ty_DisplayXDSInfo(void) { int index; int size;
--- a/libmpdemux/dvbin.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpdemux/dvbin.c Thu Feb 09 14:08:03 2006 +0000 @@ -767,7 +767,7 @@ } #define MAX_CARDS 4 -dvb_config_t *dvb_get_config() +dvb_config_t *dvb_get_config(void) { int i, fd, type, size; char filename[30], *conf_file, *name;
--- a/libmpdemux/dvbin.h Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpdemux/dvbin.h Thu Feb 09 14:08:03 2006 +0000 @@ -109,6 +109,6 @@ extern int dvb_step_channel(dvb_priv_t *, int); extern int dvb_set_channel(dvb_priv_t *, int, int); -extern dvb_config_t *dvb_get_config(); +extern dvb_config_t *dvb_get_config(void); #endif
--- a/libmpdemux/http.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpdemux/http.c Thu Feb 09 14:08:03 2006 +0000 @@ -279,7 +279,7 @@ } HTTP_header_t * -http_new_header() { +http_new_header(void) { HTTP_header_t *http_hdr; http_hdr = (HTTP_header_t*)malloc(sizeof(HTTP_header_t));
--- a/libmpdemux/http.h Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpdemux/http.h Thu Feb 09 14:08:03 2006 +0000 @@ -33,7 +33,7 @@ unsigned int is_parsed; } HTTP_header_t; -HTTP_header_t* http_new_header(); +HTTP_header_t* http_new_header(void); void http_free( HTTP_header_t *http_hdr ); int http_response_append( HTTP_header_t *http_hdr, char *data, int length ); int http_response_parse( HTTP_header_t *http_hdr );
--- a/libmpdemux/network.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpdemux/network.c Thu Feb 09 14:08:03 2006 +0000 @@ -93,7 +93,7 @@ streaming_ctrl_t * -streaming_ctrl_new( ) { +streaming_ctrl_new(void) { streaming_ctrl_t *streaming_ctrl; streaming_ctrl = (streaming_ctrl_t*)malloc(sizeof(streaming_ctrl_t)); if( streaming_ctrl==NULL ) {
--- a/libmpdemux/network.h Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpdemux/network.h Thu Feb 09 14:08:03 2006 +0000 @@ -50,7 +50,7 @@ } streaming_ctrl_t; //int streaming_start( stream_t *stream, int *demuxer_type, URL_t *url ); -streaming_ctrl_t *streaming_ctrl_new(); +streaming_ctrl_t *streaming_ctrl_new(void); int streaming_bufferize( streaming_ctrl_t *streaming_ctrl, char *buffer, int size); int nop_streaming_read( int fd, char *buffer, int size, streaming_ctrl_t *stream_ctrl );
--- a/libmpdemux/realrtsp/asmrp.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpdemux/realrtsp/asmrp.c Thu Feb 09 14:08:03 2006 +0000 @@ -95,7 +95,7 @@ } asmrp_t; -static asmrp_t *asmrp_new () { +static asmrp_t *asmrp_new (void) { asmrp_t *p;
--- a/libmpdemux/tvi_def.h Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpdemux/tvi_def.h Thu Feb 09 14:08:03 2006 +0000 @@ -28,7 +28,7 @@ get_audio_framesize }; -static tvi_handle_t *new_handle() +static tvi_handle_t *new_handle(void) { tvi_handle_t *h = (tvi_handle_t *)malloc(sizeof(tvi_handle_t));
--- a/libmpdemux/yuv4mpeg.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpdemux/yuv4mpeg.c Thu Feb 09 14:08:03 2006 +0000 @@ -101,7 +101,7 @@ *************************************************************************/ -static char *y4m_new_xtag() +static char *y4m_new_xtag(void) { return _y4m_alloc(Y4M_MAX_XTAG_SIZE * sizeof(char)); }
--- a/libmpeg2/motion_comp_mmx.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libmpeg2/motion_comp_mmx.c Thu Feb 09 14:08:03 2006 +0000 @@ -67,7 +67,7 @@ * unrolling will help */ -static inline void mmx_zero_reg () +static inline void mmx_zero_reg (void) { /* load 0 into mm0 */ pxor_r2r (mm0, mm0);
--- a/libvo/font_load.h Thu Feb 09 10:23:51 2006 +0000 +++ b/libvo/font_load.h Thu Feb 09 14:08:03 2006 +0000 @@ -77,8 +77,8 @@ extern int force_load_font; -int init_freetype(); -int done_freetype(); +int init_freetype(void); +int done_freetype(void); font_desc_t* read_font_desc_ft(char* fname,int movie_width, int movie_height); void free_font_desc(font_desc_t *desc);
--- a/libvo/font_load_ft.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libvo/font_load_ft.c Thu Feb 09 14:08:03 2006 +0000 @@ -831,7 +831,7 @@ return i; } -static font_desc_t* init_font_desc() +static font_desc_t* init_font_desc(void) { font_desc_t *desc; int i; @@ -1089,7 +1089,7 @@ return desc; } -int init_freetype() +int init_freetype(void) { int err; @@ -1104,7 +1104,7 @@ return 0; } -int done_freetype() +int done_freetype(void) { int err;
--- a/libvo/gl_common.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libvo/gl_common.c Thu Feb 09 14:08:03 2006 +0000 @@ -1144,7 +1144,7 @@ *context = 0; } -void swapGlBuffers() { +void swapGlBuffers(void) { glXSwapBuffers(mDisplay, vo_window); } #endif
--- a/libvo/gl_common.h Thu Feb 09 10:23:51 2006 +0000 +++ b/libvo/gl_common.h Thu Feb 09 14:08:03 2006 +0000 @@ -245,7 +245,7 @@ int setGlWindow(XVisualInfo **vinfo, GLXContext *context, Window win); void releaseGlContext(XVisualInfo **vinfo, GLXContext *context); #endif -void swapGlBuffers(); +void swapGlBuffers(void); extern void (APIENTRY *GenBuffers)(GLsizei, GLuint *); extern void (APIENTRY *DeleteBuffers)(GLsizei, const GLuint *);
--- a/libvo/osd.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libvo/osd.c Thu Feb 09 14:08:03 2006 +0000 @@ -258,7 +258,7 @@ static unsigned short fast_osd_16bpp_table[256]; #endif -void vo_draw_alpha_init(){ +void vo_draw_alpha_init(void){ #ifdef FAST_OSD_TABLE int i; for(i=0;i<256;i++){
--- a/libvo/osd.h Thu Feb 09 10:23:51 2006 +0000 +++ b/libvo/osd.h Thu Feb 09 14:08:03 2006 +0000 @@ -5,7 +5,7 @@ // Generic alpha renderers for all YUV modes and RGB depths. // These are "reference implementations", should be optimized later (MMX, etc) -extern void vo_draw_alpha_init(); // build tables +extern void vo_draw_alpha_init(void); // build tables extern void vo_draw_alpha_yv12(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride); extern void vo_draw_alpha_yuy2(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride);
--- a/libvo/sub.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libvo/sub.c Thu Feb 09 14:08:03 2006 +0000 @@ -731,7 +731,7 @@ static int draw_alpha_init_flag=0; -extern void vo_draw_alpha_init(); +extern void vo_draw_alpha_init(void); mp_osd_obj_t* vo_osd_list=NULL; @@ -747,7 +747,7 @@ return osd; } -void free_osd_list(){ +void free_osd_list(void){ mp_osd_obj_t* obj=vo_osd_list; while(obj){ mp_osd_obj_t* next=obj->next; @@ -857,7 +857,7 @@ return chg; } -void vo_init_osd(){ +void vo_init_osd(void){ if(!draw_alpha_init_flag){ draw_alpha_init_flag=1; vo_draw_alpha_init();
--- a/libvo/sub.h Thu Feb 09 10:23:51 2006 +0000 +++ b/libvo/sub.h Thu Feb 09 14:08:03 2006 +0000 @@ -113,11 +113,11 @@ extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)); extern void vo_remove_text(int dxs,int dys,void (*remove)(int x0,int y0, int w,int h)); -void vo_init_osd(); +void vo_init_osd(void); int vo_update_osd(int dxs,int dys); int vo_osd_changed(int new_value); int vo_osd_check_range_update(int,int,int,int); -void free_osd_list(); +void free_osd_list(void); extern int vo_osd_changed_flag;
--- a/libvo/video_out.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libvo/video_out.c Thu Feb 09 14:08:03 2006 +0000 @@ -256,7 +256,7 @@ NULL }; -void list_video_out(){ +void list_video_out(void){ int i=0; mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoOutputDrivers); if (identify)
--- a/libvo/video_out.h Thu Feb 09 10:23:51 2006 +0000 +++ b/libvo/video_out.h Thu Feb 09 14:08:03 2006 +0000 @@ -170,7 +170,7 @@ int vo_init(void); vo_functions_t* init_best_video_out(char** vo_list); -void list_video_out(); +void list_video_out(void); // NULL terminated array of all drivers extern vo_functions_t* video_out_drivers[];
--- a/libvo/vo_aa.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libvo/vo_aa.c Thu Feb 09 14:08:03 2006 +0000 @@ -191,7 +191,7 @@ } void -printosdtext() +printosdtext(void) { if(osd_text_length > 0 && !vo_osd_text) { memset(c->textbuffer,' ',osd_text_length); @@ -221,7 +221,7 @@ } void -printosdprogbar(){ +printosdprogbar(void){ /* print mplayer osd-progbar */ if (vo_osd_progbar_type!=-1){ osdpercent(1,1,0,255,vo_osd_progbar_value, __sub_osd_names[vo_osd_progbar_type], "");
--- a/libvo/vo_cvidix.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libvo/vo_cvidix.c Thu Feb 09 14:08:03 2006 +0000 @@ -45,7 +45,7 @@ static vidix_grkey_t gr_key; -static uint32_t setup_vidix(){ +static uint32_t setup_vidix(void){ int x=vo_dx,y=vo_dy; aspect(&vo_dwidth,&vo_dheight,vo_fs ? A_ZOOM : A_NOZOOM); if(vo_fs || center){
--- a/libvo/vo_gl.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libvo/vo_gl.c Thu Feb 09 14:08:03 2006 +0000 @@ -147,7 +147,7 @@ //! maximum size of custom fragment program #define MAX_CUSTOM_PROG_SIZE (1024 * 1024) -static void update_yuvconv() { +static void update_yuvconv(void) { float bri = eq_bri / 100.0; float cont = (eq_cont + 100) / 100.0; float hue = eq_hue / 100.0 * 3.1415927; @@ -203,7 +203,7 @@ /** * \brief remove all OSD textures and display-lists, thus clearing it. */ -static void clearOSD() { +static void clearOSD(void) { int i; glDeleteTextures(osdtexCnt, osdtex); #ifndef FAST_OSD @@ -217,7 +217,7 @@ /** * \brief uninitialize OpenGL context, freeing textures, buffers etc. */ -static void uninitGl() { +static void uninitGl(void) { if (DeletePrograms && fragprog) DeletePrograms(1, &fragprog); fragprog = 0;
--- a/libvo/vo_gl2.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libvo/vo_gl2.c Thu Feb 09 14:08:03 2006 +0000 @@ -100,7 +100,7 @@ int dirtyXoff, dirtyYoff, dirtyWidth, dirtyHeight; }; -static GLint getInternalFormat() +static GLint getInternalFormat(void) { #ifdef GL_WIN32 PIXELFORMATDESCRIPTOR pfd; @@ -150,7 +150,7 @@ return GL_RGB; } -static int initTextures() +static int initTextures(void) { struct TexSquare *tsq=0; GLfloat texpercx, texpercy; @@ -467,7 +467,7 @@ } -static void drawTextureDisplay () +static void drawTextureDisplay (void) { struct TexSquare *square = texgrid; int x, y/*, xoff=0, yoff=0, wd, ht*/;
--- a/libvo/vo_x11.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libvo/vo_x11.c Thu Feb 09 14:08:03 2006 +0000 @@ -148,7 +148,7 @@ static XVisualInfo vinfo; -static void getMyXImage() +static void getMyXImage(void) { #ifdef HAVE_SHM if (mLocalDisplay && XShmQueryExtension(mDisplay)) @@ -238,7 +238,7 @@ #endif } -static void freeMyXImage() +static void freeMyXImage(void) { #ifdef HAVE_SHM if (Shmem_Flag)
--- a/libvo/x11_common.c Thu Feb 09 10:23:51 2006 +0000 +++ b/libvo/x11_common.c Thu Feb 09 14:08:03 2006 +0000 @@ -940,7 +940,7 @@ } #endif -void vo_x11_uninit() +void vo_x11_uninit(void) { saver_on(mDisplay); if (vo_window != None)
--- a/libvo/x11_common.h Thu Feb 09 10:23:51 2006 +0000 +++ b/libvo/x11_common.h Thu Feb 09 14:08:03 2006 +0000 @@ -48,7 +48,7 @@ extern void vo_x11_selectinput_witherr(Display *display, Window w, long event_mask); extern void vo_x11_fullscreen( void ); extern void vo_x11_setlayer( Display * mDisplay,Window vo_window,int layer ); -extern void vo_x11_uninit(); +extern void vo_x11_uninit(void); extern Colormap vo_x11_create_colormap(XVisualInfo *vinfo); extern uint32_t vo_x11_set_equalizer(char *name, int value); extern uint32_t vo_x11_get_equalizer(char *name, int *value); @@ -59,7 +59,7 @@ extern void vo_x11_clearwindow_part(Display *mDisplay, Window vo_window, int img_width, int img_height, int use_fs); extern void vo_x11_clearwindow( Display *mDisplay, Window vo_window ); -extern void vo_x11_ontop(); +extern void vo_x11_ontop(void); extern void vo_x11_ewmh_fullscreen( int action ); #endif
--- a/mencoder.c Thu Feb 09 10:23:51 2006 +0000 +++ b/mencoder.c Thu Feb 09 14:08:03 2006 +0000 @@ -240,7 +240,7 @@ static char * frameno_filename=NULL; -static void parse_end_at(); +static void parse_end_at(void); static char * end_at_string=0; //static uint8_t* flip_upside_down(uint8_t* dst, const uint8_t* src, int width, int height); @@ -1571,7 +1571,7 @@ return interrupted; } -static void parse_end_at() +static void parse_end_at(void) { end_at_type = END_AT_NONE;
--- a/mp3lib/mp3.h Thu Feb 09 10:23:51 2006 +0000 +++ b/mp3lib/mp3.h Thu Feb 09 14:08:03 2006 +0000 @@ -9,11 +9,11 @@ extern int MP3_Open(char *filename,int buffsize); extern void MP3_SeekFrame(int num,int dir); extern void MP3_SeekForward(int num); -extern int MP3_PrintTAG(); +extern int MP3_PrintTAG(void); extern int MP3_DecodeFrame(unsigned char *hova,short single); -extern int MP3_FillBuffers(); -extern void MP3_PrintHeader(); -extern void MP3_Close(); +extern int MP3_FillBuffers(void); +extern void MP3_PrintHeader(void); +extern void MP3_Close(void); /* public variables: */ extern int MP3_eof; // set if EOF reached extern int MP3_pause; // lock playing @@ -29,7 +29,7 @@ /* player level: */ extern int MP3_OpenDevice(char *devname); /* devname can be NULL for default) */ -extern void MP3_Play(); -extern void MP3_Stop(); -extern void MP3_CloseDevice(); +extern void MP3_Play(void); +extern void MP3_Stop(void); +extern void MP3_CloseDevice(void);
--- a/mp3lib/sr1.c Thu Feb 09 10:23:51 2006 +0000 +++ b/mp3lib/sr1.c Thu Feb 09 14:08:03 2006 +0000 @@ -523,7 +523,7 @@ } // Prints last frame header in ascii. -void MP3_PrintHeader(){ +void MP3_PrintHeader(void){ static char *modes[4] = { "Stereo", "Joint-Stereo", "Dual-Channel", "Single-Channel" }; static char *layers[4] = { "???" , "I", "II", "III" };
--- a/mp_msg.c Thu Feb 09 10:23:51 2006 +0000 +++ b/mp_msg.c Thu Feb 09 14:08:03 2006 +0000 @@ -24,7 +24,7 @@ int mp_msg_level_all = MSGL_STATUS; int verbose = 0; -void mp_msg_init(){ +void mp_msg_init(void){ int i; char *env = getenv("MPLAYER_VERBOSE"); if (env)
--- a/mp_msg.h Thu Feb 09 10:23:51 2006 +0000 +++ b/mp_msg.h Thu Feb 09 14:08:03 2006 +0000 @@ -94,7 +94,7 @@ #define MSGT_MAX 64 -void mp_msg_init(); +void mp_msg_init(void); int mp_msg_test(int mod, int lev); #include "config.h"
--- a/mplayer.c Thu Feb 09 10:23:51 2006 +0000 +++ b/mplayer.c Thu Feb 09 14:08:03 2006 +0000 @@ -189,7 +189,7 @@ #include "libmpcodecs/vf.h" #include "libmpcodecs/vd.h" -extern void vf_list_plugins(); +extern void vf_list_plugins(void); //**************************************************************************// //**************************************************************************// @@ -764,7 +764,7 @@ static int play_tree_step = 1; -int sub_source() +int sub_source(void) { int source = -1; int top = -1; @@ -807,7 +807,7 @@ } // FIXME: if/when the GUI calls this, global sub numbering gets (potentially) broken. -void update_set_of_subtitles() +void update_set_of_subtitles(void) // subdata was changed, set_of_sub... have to be updated. { int i; @@ -1022,7 +1022,7 @@ * which need to be fixed while watching the movie. */ -static void log_sub(){ +static void log_sub(void){ char *fname; FILE *f; int i;
--- a/mplayer.h Thu Feb 09 10:23:51 2006 +0000 +++ b/mplayer.h Thu Feb 09 14:08:03 2006 +0000 @@ -59,6 +59,6 @@ extern int vobsub_id; extern void exit_player(char* how); -extern void update_set_of_subtitles(); +extern void update_set_of_subtitles(void); #endif
--- a/osdep/getch2.c Thu Feb 09 10:23:51 2006 +0000 +++ b/osdep/getch2.c Thu Feb 09 14:08:03 2006 +0000 @@ -118,7 +118,7 @@ #endif -void get_screen_size(){ +void get_screen_size(void){ #ifdef USE_IOCTL struct winsize ws; if (ioctl(0, TIOCGWINSZ, &ws) < 0 || !ws.ws_row || !ws.ws_col) return; @@ -217,7 +217,7 @@ static int getch2_status=0; -void getch2_enable(){ +void getch2_enable(void){ #ifdef HAVE_TERMIOS struct termios tio_new; #if defined(__NetBSD__) || defined(__svr4__) || defined(__CYGWIN__) || defined(__OS2__) || defined(__GLIBC__) || defined(_AIX) @@ -242,7 +242,7 @@ getch2_status=1; } -void getch2_disable(){ +void getch2_disable(void){ if(!getch2_status) return; // already disabled / never enabled #ifdef HAVE_TERMIOS #if defined(__NetBSD__) || defined(__svr4__) || defined(__CYGWIN__) || defined(__OS2__) || defined(__GLIBC__) || defined(_AIX)
--- a/osdep/getch2.h Thu Feb 09 10:23:51 2006 +0000 +++ b/osdep/getch2.h Thu Feb 09 14:08:03 2006 +0000 @@ -9,14 +9,14 @@ extern char * erase_to_end_of_line; /* Get screen-size using IOCTL call. */ -extern void get_screen_size(); +extern void get_screen_size(void); /* Load key definitions from the TERMCAP database. 'termtype' can be NULL */ extern int load_termcap(char *termtype); /* Enable and disable STDIN line-buffering */ -extern void getch2_enable(); -extern void getch2_disable(); +extern void getch2_enable(void); +extern void getch2_disable(void); /* Read a character or a special key code (see keycodes.h) */ extern int getch2(int halfdelay_time);
--- a/osdep/timer-lx.c Thu Feb 09 10:23:51 2006 +0000 +++ b/osdep/timer-lx.c Thu Feb 09 14:08:03 2006 +0000 @@ -29,7 +29,7 @@ } // Returns current time in microseconds -unsigned int GetTimer(){ +unsigned int GetTimer(void){ struct timeval tv; struct timezone tz; // float s; @@ -39,7 +39,7 @@ } // Returns current time in milliseconds -unsigned int GetTimerMS(){ +unsigned int GetTimerMS(void){ struct timeval tv; struct timezone tz; // float s; @@ -51,7 +51,7 @@ static unsigned int RelativeTime=0; // Returns time spent between now and last call in seconds -float GetRelativeTime(){ +float GetRelativeTime(void){ unsigned int t,r; t=GetTimer(); // t*=16;printf("time=%ud\n",t); @@ -61,7 +61,7 @@ } // Initialize timer, must be called at least once at start -void InitTimer(){ +void InitTimer(void){ GetRelativeTime(); }
--- a/osdep/timer.h Thu Feb 09 10:23:51 2006 +0000 +++ b/osdep/timer.h Thu Feb 09 14:08:03 2006 +0000 @@ -3,11 +3,11 @@ extern const char *timer_name; -void InitTimer(); -unsigned int GetTimer(); -unsigned int GetTimerMS(); +void InitTimer(void); +unsigned int GetTimer(void); +unsigned int GetTimerMS(void); //int uGetTimer(); -float GetRelativeTime(); +float GetRelativeTime(void); int usec_sleep(int usec_delay);
--- a/postproc/swscale.c Thu Feb 09 10:23:51 2006 +0000 +++ b/postproc/swscale.c Thu Feb 09 14:08:03 2006 +0000 @@ -1375,7 +1375,7 @@ } #endif // ARCH_X86 || ARCH_X86_64 -static void globalInit(){ +static void globalInit(void){ // generating tables: int i; for(i=0; i<768; i++){
--- a/sub_cc.c Thu Feb 09 10:23:51 2006 +0000 +++ b/sub_cc.c Thu Feb 09 14:08:03 2006 +0000 @@ -67,7 +67,7 @@ } -void subcc_init() +void subcc_init(void) { int i; //printf("subcc_init(): initing...\n"); @@ -107,7 +107,7 @@ } -static void swap_buffers() +static void swap_buffers(void) { subtitle *foo; foo=fb; @@ -185,7 +185,7 @@ lastcode=data; } -static void subcc_decode() +static void subcc_decode(void) { /* The first number may denote a channel number. I don't have the * EIA-708 standard, so it is hard to say.
--- a/sub_cc.h Thu Feb 09 10:23:51 2006 +0000 +++ b/sub_cc.h Thu Feb 09 14:08:03 2006 +0000 @@ -3,7 +3,7 @@ extern int subcc_enabled; -void subcc_init(); +void subcc_init(void); void subcc_process_data(unsigned char *inputdata,unsigned int len); #endif /*SUB_CC_H*/
--- a/vidix/drivers/cyberblade_vid.c Thu Feb 09 10:23:51 2006 +0000 +++ b/vidix/drivers/cyberblade_vid.c Thu Feb 09 14:08:03 2006 +0000 @@ -94,7 +94,7 @@ SROUTB(reg+1,(val>>8)&255); } -void DumpRegisters() +void DumpRegisters(void) { int reg,val; #ifdef DEBUG_LOGFILE
--- a/vidix/drivers/mach64_vid.c Thu Feb 09 10:23:51 2006 +0000 +++ b/vidix/drivers/mach64_vid.c Thu Feb 09 14:08:03 2006 +0000 @@ -304,7 +304,7 @@ return ret; } -static void mach64_vid_make_default() +static void mach64_vid_make_default(void) { mach64_fifo_wait(5); OUTREG(SCALER_COLOUR_CNTL,0x00101000);
--- a/vidix/drivers/radeon_vid.c Thu Feb 09 10:23:51 2006 +0000 +++ b/vidix/drivers/radeon_vid.c Thu Feb 09 14:08:03 2006 +0000 @@ -950,7 +950,7 @@ }; #ifdef HAVE_X11 -void probe_fireGL_driver() { +void probe_fireGL_driver(void) { Display *dp = XOpenDisplay ((void*)0); int n = 0; char **extlist;
--- a/vidix/drivers/savage_vid.c Thu Feb 09 10:23:51 2006 +0000 +++ b/vidix/drivers/savage_vid.c Thu Feb 09 14:08:03 2006 +0000 @@ -82,7 +82,7 @@ /* CR69[0] = 1 : Mem-mapped regs */ #define USE_MM_FOR_PRI_STREAM_OLD 0x01 -void SavageStreamsOn(); +void SavageStreamsOn(void); /* * There are two different streams engines used in the Savage line. @@ -323,7 +323,7 @@ { PCI_CHIP_PROSAVAGE_DDRK , S3_PROSAVAGE }, }; -void SavageSetColorOld() +void SavageSetColorOld(void) { @@ -360,7 +360,7 @@ } } -void SavageSetColorKeyOld() +void SavageSetColorKeyOld(void) { int red, green, blue; @@ -421,8 +421,8 @@ static void -SavageDisplayVideoOld( -){ +SavageDisplayVideoOld(void) +{ int vgaCRIndex, vgaCRReg, vgaIOBase; unsigned int ssControl; int cr92; @@ -528,7 +528,7 @@ } -void SavageInitStreamsOld() +void SavageInitStreamsOld(void) { /*unsigned long jDelta;*/ unsigned long format = 0; @@ -582,7 +582,7 @@ } void -SavageStreamsOn() +SavageStreamsOn(void) { unsigned char jStreamsControl; unsigned short vgaCRIndex = 0x3d0 + 4; @@ -726,7 +726,7 @@ } -void SavageStreamsOff() +void SavageStreamsOff(void) { unsigned char jStreamsControl; unsigned short vgaCRIndex = 0x3d0 + 4;
--- a/vidix/drivers/sis_bridge.c Thu Feb 09 10:23:51 2006 +0000 +++ b/vidix/drivers/sis_bridge.c Thu Feb 09 14:08:03 2006 +0000 @@ -60,7 +60,7 @@ /* sense connected devices on 30x bridge */ -static void sis_sense_30x() +static void sis_sense_30x(void) { unsigned char backupP4_0d, backupP2_00, biosflag; unsigned char testsvhs_tempbl, testsvhs_tempbh; @@ -356,7 +356,7 @@ } -static void sis_detect_crt1() +static void sis_detect_crt1(void) { unsigned char CR32; unsigned char CRT1Detected = 0; @@ -394,7 +394,7 @@ } -static void sis_detect_lcd() +static void sis_detect_lcd(void) { unsigned char CR32, CR36, CR37; @@ -413,7 +413,7 @@ } -static void sis_detect_tv() +static void sis_detect_tv(void) { unsigned char SR16, SR38, CR32, CR38 = 0, CR79; int temp = 0; @@ -517,7 +517,7 @@ } -static void sis_detect_crt2() +static void sis_detect_crt2(void) { unsigned char CR32; @@ -563,7 +563,7 @@ /* Preinit: detect video bridge and sense connected devs */ -static void sis_detect_video_bridge() +static void sis_detect_video_bridge(void) { int temp, temp1, temp2; @@ -708,7 +708,7 @@ /* detect video bridge type and sense connected devices */ -void sis_init_video_bridge() +void sis_init_video_bridge(void) { sis_detect_video_bridge();
--- a/vidix/drivers/sis_vid.c Thu Feb 09 10:23:51 2006 +0000 +++ b/vidix/drivers/sis_vid.c Thu Feb 09 14:08:03 2006 +0000 @@ -167,17 +167,17 @@ /** function declarations **/ -extern void sis_init_video_bridge(); +extern void sis_init_video_bridge(void); static void set_overlay(SISOverlayPtr pOverlay, int index); -static void close_overlay(); +static void close_overlay(void); static void calc_scale_factor(SISOverlayPtr pOverlay, int index, int iscrt2); static void set_line_buf_size(SISOverlayPtr pOverlay); static void merge_line_buf(int enable); static void set_format(SISOverlayPtr pOverlay); -static void set_colorkey(); +static void set_colorkey(void); static void set_brightness(uint8_t brightness); static void set_contrast(uint8_t contrast); @@ -219,13 +219,13 @@ } /* vblank checking*/ -static uint8_t vblank_active_CRT1() +static uint8_t vblank_active_CRT1(void) { /* this may be too simplistic? */ return (inSISREG(SISINPSTAT) & 0x08); } -static uint8_t vblank_active_CRT2() +static uint8_t vblank_active_CRT2(void) { uint8_t ret; if (sis_vga_engine == SIS_315_VGA) { @@ -445,7 +445,7 @@ return ENOSYS; } -static int bridge_in_slave_mode() +static int bridge_in_slave_mode(void) { unsigned char usScratchP1_00; @@ -465,7 +465,7 @@ /* This does not handle X dual head mode, since 1) vidix doesn't support it and 2) it doesn't make sense for other gfx drivers */ -static void set_dispmode() +static void set_dispmode(void) { sis_bridge_is_slave = 0; @@ -489,7 +489,7 @@ } } -static void set_disptype_regs() +static void set_disptype_regs(void) { switch (sis_displaymode) { case DISPMODE_SINGLE1: /* TW: CRT1 only */ @@ -527,7 +527,7 @@ } } -static void init_overlay() +static void init_overlay(void) { /* Initialize first overlay (CRT1) */ @@ -1154,7 +1154,7 @@ /* TW: Overlay MUST NOT be switched off while beam is over it */ -static void close_overlay() +static void close_overlay(void) { uint32_t watchdog; @@ -1493,7 +1493,7 @@ setvideoregmask(Index_VI_Control_Misc0, fmt, 0x7c); } -static void set_colorkey() +static void set_colorkey(void) { uint8_t r, g, b;