[vlc-devel] [PATCH v2 05/19] vout: fix warning on unused va_list

[Steve Lhomme]

---
 modules/video_output/android/display.c  | 1 +
 modules/video_output/vulkan/display.c   | 1 +
 modules/video_output/win32/common.c     | 2 +-
 modules/video_output/win32/common.h     | 2 +-
 modules/video_output/win32/direct3d11.c | 2 +-
 modules/video_output/win32/direct3d9.c  | 2 +-
 modules/video_output/win32/glwin32.c    | 2 +-
 modules/video_output/win32/wingdi.c     | 4 +++-
 modules/video_output/xcb/render.c       | 1 +
 9 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/modules/video_output/android/display.c b/modules/video_output/android/display.c
index 0b849b7f0f7..4423bb87584 100644
--- a/modules/video_output/android/display.c
+++ b/modules/video_output/android/display.c
@@ -897,6 +897,7 @@ static void CopySourceAspect(video_format_t *p_dest,
 
 static int Control(vout_display_t *vd, int query, va_list args)
 {
+    VLC_UNUSED(args);
     vout_display_sys_t *sys = vd->sys;
 
     switch (query) {
diff --git a/modules/video_output/vulkan/display.c b/modules/video_output/vulkan/display.c
index 302ed0be00f..d49d14f343b 100644
--- a/modules/video_output/vulkan/display.c
+++ b/modules/video_output/vulkan/display.c
@@ -335,6 +335,7 @@ static void PictureDisplay(vout_display_t *vd, picture_t *pic)
 
 static int Control(vout_display_t *vd, int query, va_list ap)
 {
+    VLC_UNUSED(ap);
     vout_display_sys_t *sys = vd->sys;
 
     switch (query)
diff --git a/modules/video_output/win32/common.c b/modules/video_output/win32/common.c
index ccceabfc579..28af381cea3 100644
--- a/modules/video_output/win32/common.c
+++ b/modules/video_output/win32/common.c
@@ -129,7 +129,7 @@ void CommonWindowClean(vout_display_sys_win32_t *sys)
 }
 #endif /* !VLC_WINSTORE_APP */
 
-int CommonControl(vout_display_t *vd, display_win32_area_t *area, vout_display_sys_win32_t *sys, int query, va_list args)
+int CommonControl(vout_display_t *vd, display_win32_area_t *area, vout_display_sys_win32_t *sys, int query)
 {
     switch (query) {
     case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: /* const vout_display_cfg_t *p_cfg */
diff --git a/modules/video_output/win32/common.h b/modules/video_output/win32/common.h
index 59cfe7a9f3f..639b459e076 100644
--- a/modules/video_output/win32/common.h
+++ b/modules/video_output/win32/common.h
@@ -70,7 +70,7 @@ int  CommonWindowInit(vout_display_t *, display_win32_area_t *, vout_display_sys
                       bool projection_gestures);
 void CommonWindowClean(vout_display_sys_win32_t *);
 #endif /* !VLC_WINSTORE_APP */
-int  CommonControl(vout_display_t *, display_win32_area_t *, vout_display_sys_win32_t *, int , va_list );
+int  CommonControl(vout_display_t *, display_win32_area_t *, vout_display_sys_win32_t *, int );
 
 void CommonPlacePicture (vout_display_t *, display_win32_area_t *);
 
diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index 2226509b0c1..54848fc6fbe 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -490,7 +490,7 @@ static void SetQuadVSProjection(vout_display_t *vd, d3d_quad_t *quad, const vlc_
 static int Control(vout_display_t *vd, int query, va_list args)
 {
     vout_display_sys_t *sys = vd->sys;
-    int res = CommonControl( vd, &sys->area, &sys->sys, query, args );
+    int res = CommonControl( vd, &sys->area, &sys->sys, query );
 
     if (query == VOUT_DISPLAY_CHANGE_VIEWPOINT)
     {
diff --git a/modules/video_output/win32/direct3d9.c b/modules/video_output/win32/direct3d9.c
index dc6b7bb9f7d..1c2dc79fc0d 100644
--- a/modules/video_output/win32/direct3d9.c
+++ b/modules/video_output/win32/direct3d9.c
@@ -1704,7 +1704,7 @@ static int Control(vout_display_t *vd, int query, va_list args)
         return VLC_SUCCESS;
     }
     default:
-        return CommonControl(vd, &sys->area, &sys->sys, query, args);
+        return CommonControl(vd, &sys->area, &sys->sys, query);
     }
 }
 
diff --git a/modules/video_output/win32/glwin32.c b/modules/video_output/win32/glwin32.c
index 7d692302363..fb9e7791431 100644
--- a/modules/video_output/win32/glwin32.c
+++ b/modules/video_output/win32/glwin32.c
@@ -81,7 +81,7 @@ static int Control(vout_display_t *vd, int query, va_list args)
         return vout_display_opengl_SetViewpoint(sys->vgl,
                                                 va_arg(args, const vlc_viewpoint_t*));
 
-    return CommonControl(vd, &sys->area, &sys->sys, query, args);
+    return CommonControl(vd, &sys->area, &sys->sys, query);
 }
 
 static const struct vout_window_operations embedVideoWindow_Ops =
diff --git a/modules/video_output/win32/wingdi.c b/modules/video_output/win32/wingdi.c
index 01aeeb90da8..82b9b5fd5b5 100644
--- a/modules/video_output/win32/wingdi.c
+++ b/modules/video_output/win32/wingdi.c
@@ -99,14 +99,16 @@ static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpic
 
 static int Control(vout_display_t *vd, int query, va_list args)
 {
+    VLC_UNUSED(args);
     vout_display_sys_t *sys = vd->sys;
-    return CommonControl(vd, &sys->area, &sys->sys, query, args);
+    return CommonControl(vd, &sys->area, &sys->sys, query);
 }
 
 /* */
 static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
                 video_format_t *fmtp, vlc_video_context *context)
 {
+    VLC_UNUSED(context);
     vout_display_sys_t *sys;
 
     if ( !vd->obj.force && vd->source.projection_mode != PROJECTION_MODE_RECTANGULAR)
diff --git a/modules/video_output/xcb/render.c b/modules/video_output/xcb/render.c
index 4eab7a3b1df..cb80d3e8f92 100644
--- a/modules/video_output/xcb/render.c
+++ b/modules/video_output/xcb/render.c
@@ -352,6 +352,7 @@ static void DeleteBuffers(vout_display_t *vd)
 
 static int Control(vout_display_t *vd, int query, va_list ap)
 {
+    VLC_UNUSED(ap);
     vout_display_sys_t *sys = vd->sys;
 
     switch (query) {
-- 
2.26.2