Mercurial > mplayer.hg

changeset 32336:09dd92639e7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove UNUSED macros used to shut up unused function parameter warnings. The macros are duplicated all over libvo and serve no useful purpose nowadays. A better way to shut up the warnings is -Wno-unused-parameter.
author diego
date Sat, 02 Oct 2010 14:22:03 +0000
parents fdf3f93c2828
children c1a2c51bed1c
files libvo/vesa_lvo.c libvo/vo_cvidix.c libvo/vo_svga.c libvo/vo_vesa.c libvo/vo_winvidix.c libvo/vo_xover.c libvo/vo_xvidix.c libvo/vo_xvmc.c
diffstat 8 files changed, 1 insertions(+), 63 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vesa_lvo.c	Fri Oct 01 18:29:35 2010 +0000
+++ b/libvo/vesa_lvo.c	Sat Oct 02 14:22:03 2010 +0000
@@ -45,7 +45,6 @@
 
 #define WIDTH_ALIGN 32 /* should be 16 for rage:422 and 32 for rage:420 */
 #define NUM_FRAMES 10
-#define UNUSED(x) ((void)(x)) /**< Removes warning about unused arguments */
 
 static uint8_t *frames[NUM_FRAMES];
 
@@ -227,13 +226,6 @@
 #if 0
 static void draw_alpha_null(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)
 {
-  UNUSED(x0);
-  UNUSED(y0);
-  UNUSED(w);
-  UNUSED(h);
-  UNUSED(src);
-  UNUSED(srca);
-  UNUSED(stride);
 }
 
 static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)
--- a/libvo/vo_cvidix.c	Fri Oct 01 18:29:35 2010 +0000
+++ b/libvo/vo_cvidix.c	Sat Oct 02 14:22:03 2010 +0000
@@ -49,8 +49,6 @@
 
 LIBVO_EXTERN(cvidix)
 
-#define UNUSED(x) ((void)(x)) /* Removes warning about unused arguments */
-
 /* VIDIX related */
 static char *vidix_name;
 static uint32_t swidth,sheight,sformat;
@@ -136,18 +134,11 @@
 }
 
 static int draw_slice(uint8_t *src[], int stride[],int w, int h, int x, int y){
-  UNUSED(src);
-  UNUSED(stride);
-  UNUSED(w);
-  UNUSED(h);
-  UNUSED(x);
-  UNUSED(y);
   mp_msg(MSGT_VO, MSGL_FATAL, "vo_cvidix: error: didn't use vidix draw_slice!\n");
   return -1;
 }
 
 static int draw_frame(uint8_t *src[]){
-  UNUSED(src);
   mp_msg(MSGT_VO, MSGL_FATAL, "vo_cvidix: error: didn't use vidix draw_frame!\n");
   return -1;
 }
--- a/libvo/vo_svga.c	Fri Oct 01 18:29:35 2010 +0000
+++ b/libvo/vo_svga.c	Sat Oct 02 14:22:03 2010 +0000
@@ -65,9 +65,6 @@
 
 #include <assert.h>
 
-//silence warnings, probably it have to go in some global header
-#define UNUSED(x) ((void)(x))
-
 
 static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src,
                        unsigned char *srca, int stride);
@@ -583,16 +580,11 @@
 static int draw_slice(uint8_t *image[],int stride[],
                int w, int h, int x, int y) {
     assert(0);
-    UNUSED(image);UNUSED(stride);
-    UNUSED(w);UNUSED(h);
-    UNUSED(x);UNUSED(y);
-
     return VO_ERROR;//this is yv12 only -> vf_scale should do all transforms
 }
 
 static int draw_frame(uint8_t *src[]) {
     assert(0);
-    UNUSED(src);
     return VO_ERROR;//this one should not be called
 }
 
--- a/libvo/vo_vesa.c	Fri Oct 01 18:29:35 2010 +0000
+++ b/libvo/vo_vesa.c	Sat Oct 02 14:22:03 2010 +0000
@@ -63,8 +63,6 @@
 
 #define MAX_BUFFERS 3
 
-#define UNUSED(x) ((void)(x)) /**< Removes warning about unused arguments */
-
 static const vo_info_t info =
 {
 	"VESA VBE 2.0 video output",
@@ -344,13 +342,6 @@
 
 static void draw_alpha_null(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)
 {
-  UNUSED(x0);
-  UNUSED(y0);
-  UNUSED(w);
-  UNUSED(h);
-  UNUSED(src);
-  UNUSED(srca);
-  UNUSED(stride);
 }
 
 
--- a/libvo/vo_winvidix.c	Fri Oct 01 18:29:35 2010 +0000
+++ b/libvo/vo_winvidix.c	Sat Oct 02 14:22:03 2010 +0000
@@ -52,8 +52,6 @@
 
 LIBVO_EXTERN(winvidix)
 
-#define UNUSED(x) ((void)(x)) /* Removes warning about unused arguments */
-
 /* VIDIX related */
 static char *vidix_name;
 
@@ -294,18 +292,11 @@
 }
 
 static int draw_slice(uint8_t *src[], int stride[],int w, int h, int x, int y){
-    UNUSED(src);
-    UNUSED(stride);
-    UNUSED(w);
-    UNUSED(h);
-    UNUSED(x);
-    UNUSED(y);
     mp_msg(MSGT_VO, MSGL_FATAL, "[winvidix] error: didn't use vidix draw_slice!\n");
     return -1;
 }
 
 static int draw_frame(uint8_t *src[]){
-    UNUSED(src);
     mp_msg(MSGT_VO, MSGL_FATAL, "[winvidix] error: didn't use vidix draw_frame!\n");
     return -1;
 }
--- a/libvo/vo_xover.c	Fri Oct 01 18:29:35 2010 +0000
+++ b/libvo/vo_xover.c	Sat Oct 02 14:22:03 2010 +0000
@@ -63,8 +63,6 @@
 
 LIBVO_EXTERN(xover)
 
-#define UNUSED(x) ((void)(x)) /* Removes warning about unused arguments */
-
 /* X11 related variables */
 /* Colorkey handling */
 static int colorkey;
@@ -354,19 +352,12 @@
 static int draw_slice(uint8_t *src[], int stride[],
 			   int w, int h, int x, int y)
 {
-  UNUSED(src);
-  UNUSED(stride);
-  UNUSED(w);
-  UNUSED(h);
-  UNUSED(x);
-  UNUSED(y);
   mp_msg(MSGT_VO, MSGL_FATAL, "xover error: didn't used sub vo draw_slice!\n");
   return 1;
 }
 
 static int draw_frame(uint8_t *src[])
 {
-  UNUSED(src);
   mp_msg(MSGT_VO, MSGL_FATAL, "xover error: didn't used sub vo draw_frame!\n");
   return 1;
 }
--- a/libvo/vo_xvidix.c	Fri Oct 01 18:29:35 2010 +0000
+++ b/libvo/vo_xvidix.c	Sat Oct 02 14:22:03 2010 +0000
@@ -57,7 +57,7 @@
 };
 
 LIBVO_EXTERN(xvidix)
-#define UNUSED(x) ((void)(x))   /* Removes warning about unused arguments */
+
 /* X11 related variables */
 /* Colorkey handling */
 static int colorkey;
@@ -339,12 +339,6 @@
 static int draw_slice(uint8_t * src[], int stride[],
                            int w, int h, int x, int y)
 {
-    UNUSED(src);
-    UNUSED(stride);
-    UNUSED(w);
-    UNUSED(h);
-    UNUSED(x);
-    UNUSED(y);
     mp_msg(MSGT_VO, MSGL_FATAL,
            "[xvidix] error: didn't used vidix draw_slice!\n");
     return -1;
@@ -352,7 +346,6 @@
 
 static int draw_frame(uint8_t * src[])
 {
-    UNUSED(src);
     mp_msg(MSGT_VO, MSGL_FATAL,
            "[xvidix] error: didn't used vidix draw_frame!\n");
     return -1;
--- a/libvo/vo_xvmc.c	Fri Oct 01 18:29:35 2010 +0000
+++ b/libvo/vo_xvmc.c	Sat Oct 02 14:22:03 2010 +0000
@@ -59,8 +59,6 @@
 #include <assert.h>
 
 
-#define UNUSED(x) ((void)(x))
-
 #if LIBAVCODEC_BUILD < ((51<<16)+(40<<8)+2)
 #error You need at least libavcodec v51.40.2
 #endif
@@ -672,7 +670,6 @@
 }
 
 static int draw_frame(uint8_t *srcp[]){
-    UNUSED(srcp);
     assert(0);
 }