vbox的更動 62883 路徑 trunk/src/VBox/Additions

時間撮記:

2016-8-2 下午03:51:18 (8 年 以前)

作者:

vboxsync

訊息:

Additions/*: gcc warnings.

位置:

trunk/src/VBox/Additions/x11/VBoxClient

檔案:

• VBoxClient.h (修改) (2 筆差異)
• clipboard.cpp (修改) (4 筆差異)
• display.cpp (修改) (3 筆差異)
• draganddrop.cpp (修改) (13 筆差異)
• hostversion.cpp (修改) (2 筆差異)
• main.cpp (修改) (3 筆差異)
• seamless-x11.cpp (修改) (1 筆差異)
• seamless.cpp (修改) (2 筆差異)
• testcase/tstSeamlessX11-auto.cpp (修改) (18 筆差異)

trunk/src/VBox/Additions/x11/VBoxClient/VBoxClient.h

@@ -58 +58 @@
 
 /** Default handler for various struct VBCLSERVICE member functions. */
-static int VBClServiceDefaultHandler(struct VBCLSERVICE **pSelf)
+DECLINLINE(int) VBClServiceDefaultHandler(struct VBCLSERVICE **pSelf)
 {
+    RT_NOREF1(pSelf);
     return VINF_SUCCESS;
 }
@@ -66 +67 @@
  * Usually used because the service is cleaned up automatically when the user
  * process/X11 exits. */
-static void VBClServiceDefaultCleanup(struct VBCLSERVICE **ppInterface)
+DECLINLINE(void) VBClServiceDefaultCleanup(struct VBCLSERVICE **ppInterface)
 {
     NOREF(ppInterface);

trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp

@@ -85 +85 @@
  *                    returned
  */
-int ClipRequestDataForX11(VBOXCLIPBOARDCONTEXT *pCtx, uint32_t u32Format,
-                          void **ppv, uint32_t *pcb)
-{
+int ClipRequestDataForX11(VBOXCLIPBOARDCONTEXT *pCtx, uint32_t u32Format, void **ppv, uint32_t *pcb)
+{
+    RT_NOREF1(pCtx);
     int rc = VINF_SUCCESS;
     uint32_t cb = 1024;
@@ -148 +148 @@
 void ClipReportX11Formats(VBOXCLIPBOARDCONTEXT *pCtx, uint32_t u32Formats)
 {
-    int rc;
+    RT_NOREF1(pCtx);
     LogRelFlowFunc(("u32Formats=%d\n", u32Formats));
-    rc = VbglR3ClipboardReportFormats(g_ctx.client, u32Formats);
+    int rc = VbglR3ClipboardReportFormats(g_ctx.client, u32Formats);
     LogRelFlowFunc(("rc=%Rrc\n", rc));
 }
@@ -164 +164 @@
  * @param  cb        the size of the data in @a pv
  */
-void ClipCompleteDataRequestFromX11(VBOXCLIPBOARDCONTEXT *pCtx, int rc,
-                                    CLIPREADCBREQ *pReq, void *pv,
-                                    uint32_t cb)
-{
+void ClipCompleteDataRequestFromX11(VBOXCLIPBOARDCONTEXT *pCtx, int rc, CLIPREADCBREQ *pReq, void *pv, uint32_t cb)
+{
+    RT_NOREF1(pCtx);
     if (RT_SUCCESS(rc))
         vboxClipboardSendData(pReq->u32Format, pv, cb);
@@ -287 +286 @@
 static int run(struct VBCLSERVICE **ppInterface, bool fDaemonised)
 {
-    int rc;
-
-    NOREF(ppInterface);
+    RT_NOREF2(ppInterface, fDaemonised);
+
     /* Initialise the guest library. */
-    rc = VbglR3InitUser();
+    int rc = VbglR3InitUser();
     if (RT_FAILURE(rc))
         VBClFatalError(("Failed to connect to the VirtualBox kernel service, rc=%Rrc\n", rc));

trunk/src/VBox/Additions/x11/VBoxClient/display.cpp

@@ -103 +103 @@
             RTStrPrintf(szCommand, sizeof(szCommand), "%s -s %ux%u",
                         pState->pcszXrandr, ((unsigned long *)pData)[0] >> 16, ((unsigned long *)pData)[0] & 0xFFFF);
-            system(szCommand);
+            int rcShutUpGcc = system(szCommand); RT_NOREF_PV(rcShutUpGcc);
             XFree(pData);
         }
@@ -128 +128 @@
         char szCommand[sizeof(szCommandBase) + 256];
         RTStrPrintf(szCommand, sizeof(szCommand), szCommandBase, pState->pcszXrandr);
-        system(szCommand);
+        int rcShutUpGcc = system(szCommand); RT_NOREF_PV(rcShutUpGcc);
     }
 }
@@ -252 +252 @@
 static int run(struct VBCLSERVICE **ppInterface, bool fDaemonised)
 {
+    RT_NOREF1(fDaemonised);
     struct DISPLAYSTATE *pSelf = getStateFromInterface(ppInterface);
-    int rc;
 
     if (!pSelf->mfInit)

trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp

@@ -921 +921 @@
             {
                 bool fAcceptDrop     = ASMBitTest   (&e.xclient.data.l[XdndStatusFlags], 0); /* Does the target accept the drop? */
+                RTCString strActions = xAtomToString( e.xclient.data.l[XdndStatusAction]);
+#ifdef LOG_ENABLED
                 bool fWantsPosition  = ASMBitTest   (&e.xclient.data.l[XdndStatusFlags], 1); /* Does the target want XdndPosition messages? */
-                RTCString strActions = xAtomToString( e.xclient.data.l[XdndStatusAction]);
-
                 char *pszWndName = wndX11GetNameA(e.xclient.data.l[XdndStatusWindow]);
                 AssertPtr(pszWndName);
@@ -937 +937 @@
                 RTStrFree(pszWndName);
 
-                uint16_t x = RT_HI_U16((uint32_t)e.xclient.data.l[XdndStatusNoMsgXY]);
-                uint16_t y = RT_LO_U16((uint32_t)e.xclient.data.l[XdndStatusNoMsgXY]);
-                uint16_t w = RT_HI_U16((uint32_t)e.xclient.data.l[XdndStatusNoMsgWH]);
-                uint16_t h = RT_LO_U16((uint32_t)e.xclient.data.l[XdndStatusNoMsgWH]);
-                LogFlowThisFunc(("\tReported dead area: x=%RU16, y=%RU16, w=%RU16, h=%RU16\n", x, y, w, h));
+                uint16_t x  = RT_HI_U16((uint32_t)e.xclient.data.l[XdndStatusNoMsgXY]);
+                uint16_t y  = RT_LO_U16((uint32_t)e.xclient.data.l[XdndStatusNoMsgXY]);
+                uint16_t cx = RT_HI_U16((uint32_t)e.xclient.data.l[XdndStatusNoMsgWH]);
+                uint16_t cy = RT_LO_U16((uint32_t)e.xclient.data.l[XdndStatusNoMsgWH]);
+                LogFlowThisFunc(("\tReported dead area: x=%RU16, y=%RU16, cx=%RU16, cy=%RU16\n", x, y, cx, cy));
+#endif
 
                 uint32_t uAction = DND_IGNORE_ACTION; /* Default is ignoring. */
@@ -952 +953 @@
             else if (e.xclient.message_type == xAtom(XA_XdndFinished))
             {
+#ifdef LOG_ENABLED
                 bool fSucceeded = ASMBitTest(&e.xclient.data.l[XdndFinishedFlags], 0);
 
@@ -963 +965 @@
 
                 RTStrFree(pszWndName);
+#endif
 
                 reset();
@@ -1072 +1075 @@
                     break;
                 }
-
-                int32_t lPos      = e.xclient.data.l[XdndPositionXY];
+#ifdef LOG_ENABLED
+                int32_t iPos      = e.xclient.data.l[XdndPositionXY];
                 Atom    atmAction = m_curVer >= 2 /* Actions other than "copy" or only supported since protocol version 2. */
                                   ? e.xclient.data.l[XdndPositionAction] : xAtom(XA_XdndActionCopy);
-
                 LogFlowThisFunc(("XA_XdndPosition: wndProxy=%#x, wndCur=%#x, x=%RI32, y=%RI32, strAction=%s\n",
-                                 m_wndProxy.hWnd, m_wndCur, RT_HIWORD(lPos), RT_LOWORD(lPos),
+                                 m_wndProxy.hWnd, m_wndCur, RT_HIWORD(iPos), RT_LOWORD(iPos),
                                  xAtomToString(atmAction).c_str()));
+#endif
 
                 bool fAcceptDrop = true;
@@ -1166 +1169 @@
 int DragInstance::onX11MotionNotify(const XEvent &e)
 {
+    RT_NOREF1(e);
     LogFlowThisFunc(("mode=%RU32, state=%RU32\n", m_enmMode, m_enmState));
 
@@ -1182 +1186 @@
 int DragInstance::onX11SelectionClear(const XEvent &e)
 {
+    RT_NOREF1(e);
     LogFlowThisFunc(("mode=%RU32, state=%RU32\n", m_enmMode, m_enmState));
 
@@ -1332 +1337 @@
                                  pReq->requestor,
                                  gX11->xErrorToString(xRc).c_str()));
+                    NOREF(xRc);
                 }
             }
@@ -1855 +1861 @@
 int DragInstance::hgDrop(uint32_t u32xPos, uint32_t u32yPos, uint32_t uDefaultAction)
 {
+
+
+    /** @todo r=bird: Please, stop using 'u32' as a prefix unless you've got a _real_ _important_ reason for needing the bit count. */
+
+
+    RT_NOREF3(u32xPos, u32yPos, uDefaultAction);
     LogFlowThisFunc(("wndCur=%#x, wndProxy=%#x, mode=%RU32, state=%RU32\n", m_wndCur, m_wndProxy.hWnd, m_enmMode, m_enmState));
     LogFlowThisFunc(("u32xPos=%RU32, u32yPos=%RU32, uAction=%RU32\n", u32xPos, u32yPos, uDefaultAction));
@@ -2295 +2307 @@
     {
         int rc2 = VbglR3DnDGHSendError(&m_dndCtx, rc);
-        LogFlowThisFunc(("Sending error to host resulted in %Rrc\n", rc2));
+        LogFlowThisFunc(("Sending error to host resulted in %Rrc\n", rc2)); NOREF(rc2);
         /* This is not fatal for us, just ignore. */
     }
@@ -2506 +2518 @@
 
     LogFlowThisFunc(("fInRootWnd=%RTbool, wndRoot=0x%x, wndChild=0x%x, iRootX=%d, iRootY=%d\n",
-                     RT_BOOL(fInRootWnd), wndRoot, wndChild, iRootX, iRootY));
+                     RT_BOOL(fInRootWnd), wndRoot, wndChild, iRootX, iRootY)); NOREF(fInRootWnd);
 
     if (piRootX)
@@ -2765 +2777 @@
 int DragInstance::toAtomList(const void *pvData, uint32_t cbData, VBoxDnDAtomList &lstAtoms) const
 {
+    RT_NOREF1(lstAtoms);
     AssertPtrReturn(pvData, VERR_INVALID_POINTER);
     AssertReturn(cbData, VERR_INVALID_PARAMETER);
@@ -3030 +3043 @@
 int DragAndDropService::run(bool fDaemonised /* = false */)
 {
+    RT_NOREF1(fDaemonised);
     LogFlowThisFunc(("fDaemonised=%RTbool\n", fDaemonised));
 

trunk/src/VBox/Additions/x11/VBoxClient/hostversion.cpp

@@ -76 +76 @@
         DBusMessageIter iter;
         DBusMessageIter array;
-        DBusMessageIter dict;
-        DBusMessageIter value;
-        DBusMessageIter variant;
-        DBusMessageIter data;
+        /*DBusMessageIter dict; - unused */
+        /*DBusMessageIter value; - unused */
+        /*DBusMessageIter variant; - unused */
+        /*DBusMessageIter data; - unused */
 
         /* Format: UINT32 org.freedesktop.Notifications.Notify
@@ -101 +101 @@
 
         DBusMessage *reply;
-        reply = dbus_connection_send_with_reply_and_block(conn, msg,
-            30 * 1000 /* 30 seconds timeout */, &err);
+        reply = dbus_connection_send_with_reply_and_block(conn, msg, 30 * 1000 /* 30 seconds timeout */, &err);
         if (dbus_error_is_set(&err))
-        {
             LogRel(("D-BUS returned an error while sending the notification: %s", err.message));
-        }
         else if (reply)
         {

trunk/src/VBox/Additions/x11/VBoxClient/main.cpp

@@ -46 +46 @@
 #include "VBoxClient.h"
 
-static int (*gpfnOldIOErrorHandler)(Display *) = NULL;
+/*static int (*gpfnOldIOErrorHandler)(Display *) = NULL; - unused */
 
 /** Object representing the service we are running.  This has to be global
@@ -73 +73 @@
         pszCommand = RTStrAPrintf2("notify-send \"VBoxClient: %s\"", pszMessage);
         if (pszCommand)
-            system(pszCommand);
+        {
+            int rcShutUpGcc = system(pszCommand); RT_NOREF_PV(rcShutUpGcc);
+        }
     }
     _exit(1);
@@ -124 +126 @@
 static int vboxClientXLibIOErrorHandler(Display *pDisplay)
 {
+    RT_NOREF1(pDisplay);
     LogRel(("VBoxClient: a fatal guest X Window error occurred.  This may just mean that the Window system was shut down while the client was still running.\n"));
     VBClCleanUp();

trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp

@@ -477 +477 @@
 {
     LogRelFlowFunc(("\n"));
-    unsigned cRects = 0;
     struct RectList rects = RTVEC_INITIALIZER;
 
-    if (0 != mcRects)
+    if (mcRects != 0)
     {
         int rc = RectListReserve(&rects, mcRects * 2);

trunk/src/VBox/Additions/x11/VBoxClient/seamless.cpp

@@ -191 +191 @@
  * The actual X11 window configuration change monitor thread function.
  */
-int SeamlessMain::x11MonitorThread(RTTHREAD self, void *pvUser)
-{
+int SeamlessMain::x11MonitorThread(RTTHREAD hThreadSelf, void *pvUser)
+{
+    RT_NOREF1(hThreadSelf);
     SeamlessMain *pHost = (SeamlessMain *)pvUser;
     int rc = VINF_SUCCESS;
@@ -333 +334 @@
 static int run(struct VBCLSERVICE **ppInterface, bool fDaemonised)
 {
+    RT_NOREF1(fDaemonised);
     struct SEAMLESSSERVICE *pSelf = getClassFromInterface(ppInterface);
     int rc;

trunk/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11-auto.cpp

@@ -55 +55 @@
 Display *XOpenDisplay(const char *display_name)
 {
+    RT_NOREF1(display_name);
     return TEST_DISPLAY;
 }
@@ -61 +62 @@
 int XCloseDisplay(Display *display)
 {
+    RT_NOREF1(display);
     Assert(display == TEST_DISPLAY);
     return 0;
@@ -71 +73 @@
 };
 
-extern "C" Atom XInternAtom(Display *display, const char *atom_name,
-                            Bool only_if_exists);
-Atom XInternAtom(Display *display, const char *atom_name, Bool only_if_exists)
-{
+extern "C" Atom XInternAtom(Display *display, const char *atom_name, Bool only_if_exists);
+Atom            XInternAtom(Display *display, const char *atom_name, Bool only_if_exists)
+{
+    RT_NOREF2(only_if_exists, display);
     Assert(display == TEST_DISPLAY);
     if (!RTStrCmp(atom_name, WM_TYPE_PROP))
@@ -96 +98 @@
                                   unsigned long *bytes_after_return,
                                   unsigned char **prop_return);
-int XGetWindowProperty(Display *display, Window w, Atom property,
-                       long long_offset, long long_length, Bool delProp,
-                       Atom req_type, Atom *actual_type_return,
-                       int *actual_format_return,
-                       unsigned long *nitems_return,
-                       unsigned long *bytes_after_return,
-                       unsigned char **prop_return)
-{
+int            XGetWindowProperty(Display *display, Window w, Atom property,
+                                  long long_offset, long long_length, Bool delProp,
+                                  Atom req_type, Atom *actual_type_return,
+                                  int *actual_format_return,
+                                  unsigned long *nitems_return,
+                                  unsigned long *bytes_after_return,
+                                  unsigned char **prop_return)
+{
+    RT_NOREF2(display, long_length);
     Assert(display == TEST_DISPLAY);
     Atom atomType = XInternAtom (display, WM_TYPE_PROP, true);
@@ -130 +133 @@
 }
 
+#if 0 /* unused */
 /** Sets the current set of properties for all mock X11 windows */
 static void smlsSetDesktopWindow(Window hWin)
@@ -135 +139 @@
     g_hSmlsDesktopWindow = hWin;
 }
-
-extern "C" Bool XShapeQueryExtension (Display *dpy, int *event_basep,
-                                      int *error_basep);
-Bool XShapeQueryExtension (Display *dpy, int *event_basep, int *error_basep)
-{
+#endif
+
+extern "C" Bool XShapeQueryExtension(Display *dpy, int *event_basep, int *error_basep);
+Bool            XShapeQueryExtension(Display *dpy, int *event_basep, int *error_basep)
+{
+    RT_NOREF3(dpy, event_basep, error_basep);
     Assert(dpy == TEST_DISPLAY);
     return true;
@@ -146 +151 @@
 /* We silently ignore this for now. */
 extern "C" int XSelectInput(Display *display, Window w, long event_mask);
-int XSelectInput(Display *display, Window w, long event_mask)
-{
+int            XSelectInput(Display *display, Window w, long event_mask)
+{
+    RT_NOREF3(display,  w,  event_mask);
     Assert(display == TEST_DISPLAY);
     return 0;
@@ -153 +159 @@
 
 /* We silently ignore this for now. */
-extern "C" void XShapeSelectInput(Display *display, Window w,
-                                  unsigned long event_mask);
-void XShapeSelectInput(Display *display, Window w, unsigned long event_mask)
-{
+extern "C" void XShapeSelectInput(Display *display, Window w, unsigned long event_mask);
+void            XShapeSelectInput(Display *display, Window w, unsigned long event_mask)
+{
+    RT_NOREF3(display, w, event_mask);
     Assert(display == TEST_DISPLAY);
 }
@@ -163 +169 @@
 Window XDefaultRootWindow(Display *display)
 {
+    RT_NOREF1(display);
     Assert(display == TEST_DISPLAY);
     return TEST_ROOT;
@@ -179 +186 @@
                   unsigned int *nchildren_return)
 {
+    RT_NOREF1(display);
     Assert(display == TEST_DISPLAY);
     AssertReturn(w == TEST_ROOT, False);  /* We support nothing else */
@@ -197 +205 @@
 Window XmuClientWindow(Display *dpy, Window win)
 {
+    RT_NOREF1(dpy);
     Assert(dpy == TEST_DISPLAY);
     return win;
@@ -206 +215 @@
                             XWindowAttributes *window_attributes_return)
 {
+    RT_NOREF1(display);
     Assert(display == TEST_DISPLAY);
     AssertPtrReturn(window_attributes_return, 1);
@@ -224 +234 @@
                          XSizeHints *hints_return, long *supplied_return)
 {
+    RT_NOREF4(display, w, hints_return, supplied_return);
     Assert(display == TEST_DISPLAY);
     return 1;
@@ -248 +259 @@
                                  int *count, int *ordering)
 {
+    RT_NOREF2(dpy, kind);
     Assert(dpy == TEST_DISPLAY);
     if ((window != g_SmlsShapedWindow) || (window == 0))
@@ -273 +285 @@
 int XNextEvent(Display *display, XEvent *event_return)
 {
+    RT_NOREF1(display);
     Assert(display == TEST_DISPLAY);
     event_return->xany.type = g_SmlsEventType;
@@ -292 +305 @@
                   long event_mask, XEvent *event_send)
 {
+    RT_NOREF5(display, w, propagate, event_mask, event_send);
     Assert(display == TEST_DISPLAY);
     AssertFailedReturn(0);
@@ -300 +314 @@
 int XFlush(Display *display)
 {
+    RT_NOREF1(display);
     Assert(display == TEST_DISPLAY);
     AssertFailedReturn(0);
@@ -310 +325 @@
 static void sendRegionUpdate(RTRECT *pRects, size_t cRects)
 {
+    RT_NOREF2(pRects, cRects);
     g_fNotified = true;
 }