[MPlayer-cvslog] CVS: main/libvo font_load.h, 1.13, 1.14 font_load_ft.c, 1.16, 1.17 gl_common.c, 1.40, 1.41 gl_common.h, 1.24, 1.25 osd.c, 1.24, 1.25 osd.h, 1.4, 1.5 sub.c, 1.82, 1.83 sub.h, 1.30, 1.31 video_out.c, 1.103, 1.104 video_out.h, 1.62, 1.63 vo_aa.c, 1.47, 1.48 vo_cvidix.c, 1.16, 1.17 vo_gl.c, 1.113, 1.114 vo_gl2.c, 1.86, 1.87 vo_x11.c, 1.144, 1.145 x11_common.c, 1.203, 1.204 x11_common.h, 1.44, 1.45

[Dominik Mierzejewski CVS]

CVS change done by Dominik Mierzejewski CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv31671/libvo

Modified Files:
	font_load.h font_load_ft.c gl_common.c gl_common.h osd.c osd.h 
	sub.c sub.h video_out.c video_out.h vo_aa.c vo_cvidix.c 
	vo_gl.c vo_gl2.c vo_x11.c x11_common.c x11_common.h 
Log Message:
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



Index: font_load.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/font_load.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- font_load.h	20 Nov 2003 16:25:40 -0000	1.13
+++ font_load.h	9 Feb 2006 14:07:58 -0000	1.14
@@ -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);

Index: font_load_ft.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/font_load_ft.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- font_load_ft.c	13 May 2005 19:47:50 -0000	1.16
+++ font_load_ft.c	9 Feb 2006 14:07:58 -0000	1.17
@@ -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;
 

Index: gl_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/gl_common.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gl_common.c	17 Jan 2006 20:25:42 -0000	1.40
+++ gl_common.c	9 Feb 2006 14:07:58 -0000	1.41
@@ -1144,7 +1144,7 @@
   *context = 0;
 }
 
-void swapGlBuffers() {
+void swapGlBuffers(void) {
   glXSwapBuffers(mDisplay, vo_window);
 }
 #endif

Index: gl_common.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/gl_common.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gl_common.h	18 Dec 2005 12:04:08 -0000	1.24
+++ gl_common.h	9 Feb 2006 14:07:58 -0000	1.25
@@ -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 *);

Index: osd.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/osd.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- osd.c	28 Oct 2004 01:15:52 -0000	1.24
+++ osd.c	9 Feb 2006 14:07:58 -0000	1.25
@@ -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++){

Index: osd.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/osd.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- osd.h	31 May 2004 15:10:32 -0000	1.4
+++ osd.h	9 Feb 2006 14:07:58 -0000	1.5
@@ -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);

Index: sub.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- sub.c	6 Nov 2005 02:38:47 -0000	1.82
+++ sub.c	9 Feb 2006 14:07:58 -0000	1.83
@@ -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();

Index: sub.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sub.h	5 Dec 2005 01:34:13 -0000	1.30
+++ sub.h	9 Feb 2006 14:07:59 -0000	1.31
@@ -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;
 

Index: video_out.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- video_out.c	18 Jan 2006 18:11:02 -0000	1.103
+++ video_out.c	9 Feb 2006 14:07:59 -0000	1.104
@@ -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)

Index: video_out.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- video_out.h	10 Nov 2005 22:25:54 -0000	1.62
+++ video_out.h	9 Feb 2006 14:07:59 -0000	1.63
@@ -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[];

Index: vo_aa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_aa.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- vo_aa.c	5 Aug 2005 01:24:36 -0000	1.47
+++ vo_aa.c	9 Feb 2006 14:07:59 -0000	1.48
@@ -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], "");	

Index: vo_cvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_cvidix.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- vo_cvidix.c	4 Sep 2005 20:58:39 -0000	1.16
+++ vo_cvidix.c	9 Feb 2006 14:07:59 -0000	1.17
@@ -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){

Index: vo_gl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- vo_gl.c	18 Dec 2005 12:04:08 -0000	1.113
+++ vo_gl.c	9 Feb 2006 14:07:59 -0000	1.114
@@ -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;

Index: vo_gl2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- vo_gl2.c	18 Dec 2005 12:04:08 -0000	1.86
+++ vo_gl2.c	9 Feb 2006 14:07:59 -0000	1.87
@@ -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*/;

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- vo_x11.c	5 Aug 2005 01:24:36 -0000	1.144
+++ vo_x11.c	9 Feb 2006 14:07:59 -0000	1.145
@@ -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)

Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- x11_common.c	12 Jan 2006 20:04:35 -0000	1.203
+++ x11_common.c	9 Feb 2006 14:07:59 -0000	1.204
@@ -940,7 +940,7 @@
 }
 #endif
 
-void vo_x11_uninit()
+void vo_x11_uninit(void)
 {
     saver_on(mDisplay);
     if (vo_window != None)

Index: x11_common.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- x11_common.h	10 Nov 2005 02:39:31 -0000	1.44
+++ x11_common.h	9 Feb 2006 14:07:59 -0000	1.45
@@ -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