Changeset 18508 in vbox

Timestamp:

Mar 29, 2009 2:44:49 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

45356

Message:

crVBoxHGCMDoDisconnect: unused variable warnings (host).

File:

• trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c (modified) (5 diffs)

trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c

@@ -769 +769 @@
 static void crVBoxHGCMDoDisconnect( CRConnection *conn )
 {
+#ifdef IN_GUEST
     VBoxGuestHGCMDisconnectInfo info;
-#ifdef RT_OS_WINDOWS
+# ifdef RT_OS_WINDOWS
     DWORD cbReturned;
-#endif
+# endif
     int i;
+#endif
 
     if (conn->pHostBuffer)
@@ -802 +804 @@
 
 #ifndef IN_GUEST
-#else
+#else /* IN_GUEST */
     if (conn->u32ClientID)
     {
@@ -808 +810 @@
         info.u32ClientID = conn->u32ClientID;
 
-#ifdef RT_OS_WINDOWS
+# ifdef RT_OS_WINDOWS
         if ( !DeviceIoControl(g_crvboxhgcm.hGuestDrv,
                                VBOXGUEST_IOCTL_HGCM_DISCONNECT,
@@ -818 +820 @@
             crDebug("Disconnect failed with %x\n", GetLastError());
         }
-#elif defined(RT_OS_SOLARIS)
+# elif defined(RT_OS_SOLARIS)
         VBGLBIGREQ Hdr;
         Hdr.u32Magic = VBGLBIGREQ_MAGIC;
         Hdr.cbData = sizeof(info);
         Hdr.pvDataR3 = &info;
-# if HC_ARCH_BITS == 32
+#  if HC_ARCH_BITS == 32
         Hdr.u32Padding = 0;
+#  endif
+        if (ioctl(g_crvboxhgcm.iGuestDrv, VBOXGUEST_IOCTL_HGCM_DISCONNECT, &Hdr) >= 0)
+# else
+        if (ioctl(g_crvboxhgcm.iGuestDrv, VBOXGUEST_IOCTL_HGCM_DISCONNECT, &info, sizeof (info)) < 0)
+        {
+            crDebug("Disconnect failed with %x\n", errno);
+        }
 # endif
-        if (ioctl(g_crvboxhgcm.iGuestDrv, VBOXGUEST_IOCTL_HGCM_DISCONNECT, &Hdr) >= 0)
-#else
-        if (ioctl(g_crvboxhgcm.iGuestDrv, VBOXGUEST_IOCTL_HGCM_DISCONNECT, &info, sizeof (info)) < 0)
-        {
-            crDebug("Disconnect failed with %x\n", errno);
-        }
-#endif
 
         conn->u32ClientID = 0;
@@ -845 +847 @@
     if (i>=g_crvboxhgcm.num_conns)
     {
-#ifdef RT_OS_WINDOWS
+# ifdef RT_OS_WINDOWS
         CloseHandle(g_crvboxhgcm.hGuestDrv);
         g_crvboxhgcm.hGuestDrv = INVALID_HANDLE_VALUE;
-#else
+# else
         close(g_crvboxhgcm.iGuestDrv);
         g_crvboxhgcm.iGuestDrv = INVALID_HANDLE_VALUE;
-#endif
-    }
-#endif
+# endif
+    }
+#endif /* IN_GUEST */
 }