vbox的更動 26010 路徑 trunk/src/VBox/HostServices/SharedClipboard/service.cpp

時間撮記:

2010-1-25 下午03:03:19 (15 年 以前)

作者:

vboxsync

訊息:

more warnings.

檔案:

• trunk/src/VBox/HostServices/SharedClipboard/service.cpp (修改) (3 筆差異)

trunk/src/VBox/HostServices/SharedClipboard/service.cpp

@@ -338 +338 @@
     if (g_pClient != NULL)
     {
-        uint32_t u32ClientID = g_pClient->u32ClientID;
-
-        svcDisconnect(NULL, u32ClientID, g_pClient);
+        uint32_t u32OldClientID = g_pClient->u32ClientID;
+
+        svcDisconnect(NULL, u32OldClientID, g_pClient);
         /* And free the resources in the hgcm subsystem. */
-        g_pHelpers->pfnDisconnectClient(g_pHelpers->pvInstance, u32ClientID);
+        g_pHelpers->pfnDisconnectClient(g_pHelpers->pvInstance, u32OldClientID);
     }
 
@@ -766 +766 @@
 }
 
+/**
+ * This structure corresponds to the original layout of the
+ * VBOXCLIPBOARDCLIENTDATA structure.  As the structure was saved as a whole
+ * when saving state, we need to remember it forever in order to preserve
+ * compatibility.
+ *
+ * (Starting with 3.1 this is no longer used.)
+ *
+ * @remarks Putting this outside svcLoadState to avoid visibility warning caused
+ *          by -Wattributes.
+ */
+typedef struct CLIPSAVEDSTATEDATA
+{
+    struct CLIPSAVEDSTATEDATA *pNext;
+    struct CLIPSAVEDSTATEDATA *pPrev;
+
+    VBOXCLIPBOARDCONTEXT *pCtx;
+
+    uint32_t u32ClientID;
+
+    bool fAsync: 1; /* Guest is waiting for a message. */
+
+    bool fMsgQuit: 1;
+    bool fMsgReadData: 1;
+    bool fMsgFormats: 1;
+
+    struct {
+        VBOXHGCMCALLHANDLE callHandle;
+        VBOXHGCMSVCPARM *paParms;
+    } async;
+
+    struct {
+         void *pv;
+         uint32_t cb;
+         uint32_t u32Format;
+    } data;
+
+    uint32_t u32AvailableFormats;
+    uint32_t u32RequestedFormat;
+
+} CLIPSAVEDSTATEDATA;
+
 static DECLCALLBACK(int) svcLoadState(void *, uint32_t u32ClientID, void *pvClient, PSSMHANDLE pSSM)
 {
@@ -790 +832 @@
     else if (lenOrVer == (SSMR3HandleHostBits (pSSM) == 64 ? 72 : 48))
     {
-        /**
-         * This structure corresponds to the original layout of the
-         * VBOXCLIPBOARDCLIENTDATA structure.  As the structure was saved as a whole
-         * when saving state, we need to remember it forever in order to preserve
-         * compatibility.
-         *
-         * (Starting with 3.1 this is no longer used.)
-         */
-        typedef struct _CLIPSAVEDSTATEDATA
-        {
-            struct _CLIPSAVEDSTATEDATA *pNext;
-            struct _CLIPSAVEDSTATEDATA *pPrev;
-
-            VBOXCLIPBOARDCONTEXT *pCtx;
-
-            uint32_t u32ClientID;
-
-            bool fAsync: 1; /* Guest is waiting for a message. */
-
-            bool fMsgQuit: 1;
-            bool fMsgReadData: 1;
-            bool fMsgFormats: 1;
-
-            struct {
-                VBOXHGCMCALLHANDLE callHandle;
-                VBOXHGCMSVCPARM *paParms;
-            } async;
-
-            struct {
-                 void *pv;
-                 uint32_t cb;
-                 uint32_t u32Format;
-            } data;
-
-            uint32_t u32AvailableFormats;
-            uint32_t u32RequestedFormat;
-
-        } CLIPSAVEDSTATEDATA;
-
         /**
          * SSM descriptor table for the CLIPSAVEDSTATEDATA structure.