[vbox-dev] [PATCH 1/2] Additions: VboxVideo: Fix compiler warning when building Linux vboxvideo driver

Hans de Goede hdegoede at redhat.com
Tue Jun 6 09:40:40 GMT 2017


This commit fixes the following compiler warning:

drivers/staging/vboxvideo/osindependent/Modesetting.c: In function ‘VBoxHGSMIGetModeHints’:
drivers/staging/vboxvideo/osindependent/Modesetting.c:346:5: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
     void *p = VBoxHGSMIBufferAlloc(pCtx,   sizeof(VBVAQUERYMODEHINTS)
     ^~~~

Signed-off-by: Hans de Goede <hdegoede at redhat.com>
---
 src/VBox/Additions/common/VBoxVideo/Modesetting.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp b/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp
index bd16ff60..9a7c0553 100644
--- a/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp
+++ b/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp
@@ -340,12 +340,15 @@ DECLHIDDEN(int) VBoxHGSMIGetModeHints(PHGSMIGUESTCOMMANDCONTEXT pCtx,
                                       unsigned cScreens, VBVAMODEHINT *paHints)
 {
     int rc;
+    void *p;
+
     AssertPtr(paHints);
     if (!VALID_PTR(paHints))
         return VERR_INVALID_POINTER;
-    void *p = VBoxHGSMIBufferAlloc(pCtx,   sizeof(VBVAQUERYMODEHINTS)
-                                         + cScreens * sizeof(VBVAMODEHINT),
-                                   HGSMI_CH_VBVA, VBVA_QUERY_MODE_HINTS);
+
+    p = VBoxHGSMIBufferAlloc(pCtx, sizeof(VBVAQUERYMODEHINTS)
+                                       + cScreens * sizeof(VBVAMODEHINT),
+                             HGSMI_CH_VBVA, VBVA_QUERY_MODE_HINTS);
     if (!p)
     {
         // LogFunc(("HGSMIHeapAlloc failed\n"));
-- 
2.13.0




More information about the vbox-dev mailing list