RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Add missing 'void' to parameterless function declarations. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29254 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2009-05-04 17:35:26 +00:00
parent 56a13121a7
commit d9ded9284c
24 changed files with 70 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DOCS/tech/libao2.txt
View File

@ -12,16 +12,16 @@ static int init(int rate,int channels,int format,int flags);
Sample format: usually AFMT_S16_LE or AFMT_U8, for more definitions see
dec_audio.c and linux/soundcards.h files!
static void uninit();
static void uninit(void);
Guess what.
Ok I help: closes the device, not (yet) called when exit.
static void reset();
static void reset(void);
Resets device. To be exact, it's for deleting buffers' contents,
so after reset() the previously received stuff won't be output.
(called if pause or seek)
static int get_space();
static int get_space(void);
Returns how many bytes can be written into the audio buffer without
blocking (making caller process wait). MPlayer occasionally checks the
remaining space and tries to fill the buffer with play() if there's free
@ -41,7 +41,7 @@ static int play(void* data,int len,int flags);
rounded down to 0 or the data will never be played (as MPlayer will never
call play() with a larger len).
static float get_delay();
static float get_delay(void);
Returns how long time it will take to play the data currently in the
output buffer. Be exact, if possible, since the whole timing depends
on this! In the worst case, return the maximum delay.

2
get_path.c
View File

@ -140,7 +140,7 @@ char *get_path(const char *filename){
}
#if (defined(__MINGW32__) || defined(__CYGWIN__)) && defined(CONFIG_WIN32DLL)
void set_path_env()
void set_path_env(void)
{
/*make our codec dirs available for LoadLibraryA()*/
char tmppath[MAX_PATH*2 + 1];

2
get_path.h
View File

@ -22,6 +22,6 @@
#define MPLAYER_GET_PATH_H
char *get_path(const char *filename);
void set_path_env();
void set_path_env(void);
#endif /* MPLAYER_GET_PATH_H */

2
input/ar.c
View File

@ -303,7 +303,7 @@ mp_input_ar_init_error:
return -1;
}
int is_mplayer_front()
int is_mplayer_front(void)
{
ProcessSerialNumber myProc, frProc;
Boolean sameProc;

2
liba52/test.c
View File

@ -43,7 +43,7 @@ void mp_msg( int x, const char *format, ... ) // stub for cpudetect.c
}
#ifdef TIMING
static inline long long rdtsc()
static inline long long rdtsc(void)
{
long long l;
__asm__ volatile("rdtsc\n\t"

4
libao2/ao_coreaudio.c
View File

@ -215,7 +215,7 @@ static void print_format(int lev, const char* str, const AudioStreamBasicDescrip
static int AudioDeviceSupportsDigital( AudioDeviceID i_dev_id );
static int AudioStreamSupportsDigital( AudioStreamID i_stream_id );
static int OpenSPDIF();
static int OpenSPDIF(void);
static int AudioStreamChangeFormat( AudioStreamID i_stream_id, AudioStreamBasicDescription change_format );
static OSStatus RenderCallbackSPDIF( AudioDeviceID inDevice,
const AudioTimeStamp * inNow,
@ -473,7 +473,7 @@ err_out:
/*****************************************************************************
* Setup a encoded digital stream (SPDIF)
*****************************************************************************/
static int OpenSPDIF()
static int OpenSPDIF(void)
{
OSStatus err = noErr;
UInt32 i_param_size, b_mix = 0;

2
libmpcodecs/ad_qtaudio.c
View File

@ -81,7 +81,7 @@ HMODULE WINAPI LoadLibraryA(LPCSTR);
FARPROC WINAPI GetProcAddress(HMODULE,LPCSTR);
int WINAPI FreeLibrary(HMODULE);
static int loader_init()
static int loader_init(void)
{
#ifdef WIN32_LOADER

18
libmpcodecs/vqf.h
View File

@ -193,7 +193,7 @@ typedef struct {
//DllPort int TvqInitialize( headerInfo *setupInfo, INDEX *index, int dispErrorMessageBox );
//DllPort void TvqTerminate( INDEX *index );
//DllPort void TvqGetVectorInfo(int *bits0[], int *bits1[]);
//DllPort void TvqResetFrameCounter();
//DllPort void TvqResetFrameCounter(void);
// TwinVQ decoder function
//DllPort void TvqDecodeFrame(INDEX *indexp, float out[]);
@ -205,19 +205,19 @@ typedef struct {
//DllPort int TvqCheckVersion(char *versionID);
//DllPort void TvqGetSetupInfo(headerInfo *setupInfo); // setup information
//DllPort void TvqGetConfInfo(tvqConfInfo *cf); // configuration information
//DllPort int TvqGetFrameSize(); // frame size
//DllPort int TvqGetNumChannels(); // number of channels
//DllPort int TvqGetBitRate(); // total bitrate
//DllPort float TvqGetSamplingRate(); // sampling rate
//DllPort int TvqGetNumFixedBitsPerFrame(); // number of fixed bits per frame
//DllPort int TvqGetNumFrames(); // number of decoded frame
//DllPort int TvqGetFrameSize(void); // frame size
//DllPort int TvqGetNumChannels(void); // number of channels
//DllPort int TvqGetBitRate(void); // total bitrate
//DllPort float TvqGetSamplingRate(void); // sampling rate
//DllPort int TvqGetNumFixedBitsPerFrame(void); // number of fixed bits per frame
//DllPort int TvqGetNumFrames(void); // number of decoded frame
//DllPort int TvqGetModuleVersion( char* versionString );
#ifdef V2PLUS_SUPPORT
// TwinVQ FB coding tool control
DllPort void TvqFbCountUsedBits(int nbit); // count number of used bits
DllPort float TvqGetFbCurrentBitrate(); // query average bitrate for the tool
DllPort int TvqGetFbTotalBits(); // query total number of used bits
DllPort float TvqGetFbCurrentBitrate(void); // query average bitrate for the tool
DllPort int TvqGetFbTotalBits(void); // query total number of used bits
#endif
#ifdef __cplusplus

2
libvo/mga_common.c
View File

@ -454,7 +454,7 @@ static int mga_init(int width,int height,unsigned int format){
return 0;
}
static int mga_uninit(){
static int mga_uninit(void){
if(f>=0){
ioctl( f,MGA_VID_OFF,0 );
munmap(frames[0],mga_vid_config.frame_size*mga_vid_config.num_frames);

2
libvo/vo_caca.c
View File

@ -140,7 +140,7 @@ static void osdpercent(int duration, int min, int max, int val, const char *desc
posbar[screen_w] = '\0';
}
static int resize ()
static int resize(void)
{
screen_w = caca_get_width();
screen_h = caca_get_height();

12
libvo/vo_directx.c
View File

@ -200,7 +200,7 @@ query_format(uint32_t format)
return 0;
}
static uint32_t Directx_CreatePrimarySurface()
static uint32_t Directx_CreatePrimarySurface(void)
{
DDSURFACEDESC2 ddsd;
//cleanup
@ -310,7 +310,7 @@ static uint32_t Directx_CreateOverlay(uint32_t imgfmt)
return 0;
}
static uint32_t Directx_CreateBackpuffer()
static uint32_t Directx_CreateBackpuffer(void)
{
DDSURFACEDESC2 ddsd;
//cleanup
@ -416,7 +416,7 @@ static BOOL WINAPI EnumCallbackEx(GUID FAR *lpGUID, LPSTR lpDriverDescription, L
return 1; // list all adapters
}
static uint32_t Directx_InitDirectDraw()
static uint32_t Directx_InitDirectDraw(void)
{
HRESULT (WINAPI *OurDirectDrawCreateEx)(GUID *,LPVOID *, REFIID,IUnknown FAR *);
DDSURFACEDESC2 ddsd;
@ -533,7 +533,7 @@ static void check_events(void)
}
}
static uint32_t Directx_ManageDisplay()
static uint32_t Directx_ManageDisplay(void)
{
HRESULT ddrval;
DDCAPS capsDrv;
@ -763,7 +763,7 @@ static uint32_t Directx_ManageDisplay()
}
//find out supported overlay pixelformats
static uint32_t Directx_CheckOverlayPixelformats()
static uint32_t Directx_CheckOverlayPixelformats(void)
{
DDCAPS capsDrv;
HRESULT ddrval;
@ -824,7 +824,7 @@ static uint32_t Directx_CheckOverlayPixelformats()
}
//find out the Pixelformat of the Primary Surface
static uint32_t Directx_CheckPrimaryPixelformat()
static uint32_t Directx_CheckPrimaryPixelformat(void)
{
uint32_t i=0;
uint32_t formatcount = 0;

2
libvo/vo_dxr2.c
View File

@ -203,7 +203,7 @@ int write_dxr2(const unsigned char *data, int len)
return w;
}
static void flush_dxr2()
static void flush_dxr2(void)
{
int w;
while (dxr2bufpos) {

16
libvo/vo_quartz.c
View File

@ -151,10 +151,10 @@ enum
static OSStatus KeyEventHandler(EventHandlerCallRef nextHandler, EventRef event, void *userData);
static OSStatus MouseEventHandler(EventHandlerCallRef nextHandler, EventRef event, void *userData);
static OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, EventRef event, void *userData);
void window_resized();
void window_ontop();
void window_fullscreen();
void window_panscan();
void window_resized(void);
void window_ontop(void);
void window_fullscreen(void);
void window_panscan(void);
static inline int convert_key(UInt32 key, UInt32 charcode)
{
@ -1315,7 +1315,7 @@ static int control(uint32_t request, void *data, ...)
return VO_NOTIMPL;
}
void window_resized()
void window_resized(void)
{
float aspectX;
float aspectY;
@ -1396,7 +1396,7 @@ void window_resized()
QDEndCGContext(GetWindowPort(theWindow), &context);
}
void window_ontop()
void window_ontop(void)
{
if (!vo_quartz_fs)
{
@ -1408,7 +1408,7 @@ void window_ontop()
SetWindowGroupLevel(winGroup, CGWindowLevelForKey(levelList[winLevel]));
}
void window_fullscreen()
void window_fullscreen(void)
{
// go fullscreen
if (vo_fs)
@ -1493,7 +1493,7 @@ void window_fullscreen()
window_resized();
}
void window_panscan()
void window_panscan(void)
{
panscan_calc();

2
libvo/vo_tdfxfb.c
View File

@ -202,7 +202,7 @@ static void uninit(void)
}
}
static void clear_screen()
static void clear_screen(void)
{
/* There needs to be some sort of delay here or else things seriously
* screw up. Causes the image to not be the right size on screen if

2
loader/dmo/dmo.c
View File

@ -12,7 +12,7 @@
#include <string.h>
#include "win32.h" // printf macro
void trapbug();
void trapbug(void);
typedef long STDCALL (*GETCLASS) (const GUID*, const GUID*, void**);
void DMO_Filter_Destroy(DMO_Filter* This)

2
loader/dshow/DS_Filter.c
View File

@ -30,8 +30,6 @@ HRESULT STDCALL CoInitialize(LPVOID pvReserved);
void STDCALL CoUninitialize(void);
#endif
//void trapbug();
static void DS_Filter_Start(DS_Filter* This)
{
HRESULT hr;

2
loader/registry.c
View File

@ -216,7 +216,7 @@ static reg_handle_t* find_handle(int handle)
}
return 0;
}
static int generate_handle()
static int generate_handle(void)
{
static unsigned int zz=249;
zz++;

2
loader/vfl.c
View File

@ -223,7 +223,7 @@ LRESULT VFWAPI ICClose(HIC hic) {
return 0;
}
int VFWAPI ICDoSomething()
int VFWAPI ICDoSomething(void)
{
return 0;
}

40
loader/win32.c
View File

@ -90,7 +90,7 @@ static void do_cpuid(unsigned int ax, unsigned int *regs)
: "0" (ax), "S" (regs)
);
}
static unsigned int c_localcount_tsc()
static unsigned int c_localcount_tsc(void)
{
int a;
__asm__ volatile
@ -116,7 +116,7 @@ static void c_longcount_tsc(long long* z)
:"edx"
);
}
static unsigned int c_localcount_notsc()
static unsigned int c_localcount_notsc(void)
{
struct timeval tv;
unsigned limit=~0;
@ -485,7 +485,7 @@ static void* my_realloc(void* memory, int size)
*
*/
static int WINAPI ext_unknown()
static int WINAPI ext_unknown(void)
{
printf("Unknown func called\n");
return 0;
@ -1134,7 +1134,7 @@ static WIN_BOOL WINAPI expIsProcessorFeaturePresent(DWORD v)
}
static long WINAPI expGetVersion()
static long WINAPI expGetVersion(void)
{
dbgprintf("GetVersion() => 0xC0000004\n");
return 0xC0000004;//Windows 95
@ -1426,12 +1426,12 @@ static void WINAPI expDeleteCriticalSection(CRITICAL_SECTION *c)
#endif
return;
}
static int WINAPI expGetCurrentThreadId()
static int WINAPI expGetCurrentThreadId(void)
{
dbgprintf("GetCurrentThreadId() => %d\n", pthread_self());
return pthread_self();
}
static int WINAPI expGetCurrentProcess()
static int WINAPI expGetCurrentProcess(void)
{
dbgprintf("GetCurrentProcess() => %d\n", getpid());
return getpid();
@ -1445,7 +1445,7 @@ extern void* fs_seg;
//static int tls_count;
static int tls_use_map[64];
static int WINAPI expTlsAlloc()
static int WINAPI expTlsAlloc(void)
{
int i;
for(i=0; i<64; i++)
@ -1496,7 +1496,7 @@ struct tls_s {
struct tls_s* next;
};
static void* WINAPI expTlsAlloc()
static void* WINAPI expTlsAlloc(void)
{
if (g_tls == NULL)
{
@ -1913,7 +1913,7 @@ static DWORD WINAPI expRegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_l
/*
* return CPU clock (in kHz), using linux's /proc filesystem (/proc/cpuinfo)
*/
static double linux_cpuinfo_freq()
static double linux_cpuinfo_freq(void)
{
double freq=-1;
FILE *f;
@ -1945,7 +1945,7 @@ static double linux_cpuinfo_freq()
}
static double solaris_kstat_freq()
static double solaris_kstat_freq(void)
{
#if defined(HAVE_LIBKSTAT) && defined(KSTAT_DATA_INT32)
/*
@ -1988,7 +1988,7 @@ static double solaris_kstat_freq()
/*
* Measure CPU freq using the pentium's time stamp counter register (TSC)
*/
static double tsc_freq()
static double tsc_freq(void)
{
static double ofreq=0.0;
int i;
@ -2004,7 +2004,7 @@ static double tsc_freq()
return ofreq;
}
static double CPU_Freq()
static double CPU_Freq(void)
{
double freq;
@ -2023,7 +2023,7 @@ static long WINAPI expQueryPerformanceFrequency(long long* z)
dbgprintf("QueryPerformanceFrequency(0x%x) => 1 ( %Ld )\n", z, *z);
return 1;
}
static long WINAPI exptimeGetTime()
static long WINAPI exptimeGetTime(void)
{
struct timeval t;
long result;
@ -2116,13 +2116,13 @@ static int WINAPI expCloseHandle(long v1)
return 1;
}
static const char* WINAPI expGetCommandLineA()
static const char* WINAPI expGetCommandLineA(void)
{
dbgprintf("GetCommandLineA() => \"c:\\aviplay.exe\"\n");
return "c:\\aviplay.exe";
}
static short envs[]={'p', 'a', 't', 'h', ' ', 'c', ':', '\\', 0, 0};
static LPWSTR WINAPI expGetEnvironmentStringsW()
static LPWSTR WINAPI expGetEnvironmentStringsW(void)
{
dbgprintf("GetEnvironmentStringsW() => 0\n", envs);
return 0;
@ -2160,7 +2160,7 @@ static int WINAPI expFreeEnvironmentStringsA(char* strings)
static const char ch_envs[]=
"__MSVCRT_HEAP_SELECT=__GLOBAL_HEAP_SELECTED,1\r\n"
"PATH=C:\\;C:\\windows\\;C:\\windows\\system\r\n";
static LPCSTR WINAPI expGetEnvironmentStrings()
static LPCSTR WINAPI expGetEnvironmentStrings(void)
{
dbgprintf("GetEnvironmentStrings() => 0x%x\n", ch_envs);
return (LPCSTR)ch_envs;
@ -2818,7 +2818,7 @@ static int WINAPI expSizeofResource(int v1, int v2)
return result;
}
static int WINAPI expGetLastError()
static int WINAPI expGetLastError(void)
{
int result=GetLastError();
dbgprintf("GetLastError() => 0x%x\n", result);
@ -2914,7 +2914,7 @@ static int WINAPI expReleaseDC(int hwnd, int hdc)
return 1;
}
static int WINAPI expGetDesktopWindow()
static int WINAPI expGetDesktopWindow(void)
{
dbgprintf("GetDesktopWindow() => 0\n");
return 0;
@ -3581,7 +3581,7 @@ static UINT WINAPI expGetSystemDirectoryA(
}
/*
static char sysdir[]=".";
static LPCSTR WINAPI expGetSystemDirectoryA()
static LPCSTR WINAPI expGetSystemDirectoryA(void)
{
dbgprintf("GetSystemDirectoryA() => 0x%x='%s'\n", sysdir, sysdir);
return sysdir;
@ -4039,7 +4039,7 @@ static int exp_initterm_e(INITTERMFUNC *start, INITTERMFUNC *end)
return 0;
}
static void* exp__dllonexit()
static void* exp__dllonexit(void)
{
// FIXME extract from WINE
return NULL;

8
osdep/timer-darwin.c
View File

@ -52,19 +52,19 @@ int usec_sleep(int usec_delay)
/* current time in microseconds */
unsigned int GetTimer()
unsigned int GetTimer(void)
{
return (unsigned int)(uint64_t)(mach_absolute_time() * timebase_ratio * 1e6);
}
/* current time in milliseconds */
unsigned int GetTimerMS()
unsigned int GetTimerMS(void)
{
return (unsigned int)(uint64_t)(mach_absolute_time() * timebase_ratio * 1e3);
}
/* time spent between now and last call in seconds */
float GetRelativeTime()
float GetRelativeTime(void)
{
double last_time = relative_time;
@ -77,7 +77,7 @@ float GetRelativeTime()
}
/* initialize timer, must be called at least once at start */
void InitTimer()
void InitTimer(void)
{
struct mach_timebase_info timebase;

2
osdep/timer.h
View File

@ -24,7 +24,7 @@ extern const char *timer_name;
void InitTimer(void);
unsigned int GetTimer(void);
unsigned int GetTimerMS(void);
//int uGetTimer();
//int uGetTimer(void);
float GetRelativeTime(void);
int usec_sleep(int usec_delay);

2
vidix/sysdep/AsmMacros_powerpc.h
View File

@ -66,7 +66,7 @@
extern unsigned char *ioBase;
static __inline__ volatile void eieio()
static __inline__ volatile void eieio(void)
{
__asm__ volatile ("eieio");
}

4
vidix/sysdep/AsmMacros_x86.h
View File

@ -321,7 +321,7 @@ static __inline__ unsigned int inl(short port)
return ret;
}
static __inline__ void intr_disable()
static __inline__ void intr_disable(void)
{
#ifdef CONFIG_SVGAHELPER
if (svgahelper_initialized == 1)
@ -330,7 +330,7 @@ static __inline__ void intr_disable()
__asm__ volatile("cli");
}
static __inline__ void intr_enable()
static __inline__ void intr_enable(void)
{
#ifdef CONFIG_SVGAHELPER
if (svgahelper_initialized == 1)

2
vidix/sysdep/pci_win32.c
View File

@ -31,7 +31,7 @@
#include "vidix/dhahelperwin/dhahelper.h"
static HANDLE hDriver;
int IsWinNT();
int IsWinNT(void);