Changeset 12961 in vbox for trunk/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp

Timestamp:

Oct 2, 2008 9:22:56 PM (17 years ago)

Author:

vboxsync

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

37389

Message:

suplibOsInit/linux: use local hDevice like the rest of the gang.

File:

• trunk/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp (modified) (5 diffs)

trunk/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp

@@ -82 +82 @@
     if (fPreInited)
         return VINF_SUCCESS;
+    Assert(pThis->hDevice == NIL_RTFILE);
 
     /*
@@ -95 +96 @@
      * Try open the device.
      */
-    pThis->hDevice = open(DEVICE_NAME, O_RDWR, 0);
-    if ((int)pThis->hDevice < 0)
+    int hDevice = open(DEVICE_NAME, O_RDWR, 0);
+    if (hDevice < 0)
     {
         /*
          * Try load the device.
          */
-        pThis->hDevice = open(DEVICE_NAME, O_RDWR, 0);
-        if ((int)pThis->hDevice < 0)
+        hDevice = open(DEVICE_NAME, O_RDWR, 0);
+        if (hDevice < 0)
         {
             int rc;
@@ -122 +123 @@
      * Mark the file handle close on exec.
      */
-    if (fcntl(pThis->hDevice, F_SETFD, FD_CLOEXEC) == -1)
-    {
-        close(pThis->hDevice);
-        pThis->hDevice = -1;
+    if (fcntl(hDevice, F_SETFD, FD_CLOEXEC) == -1)
+    {
+        close(hDevice);
 #ifdef IN_SUP_HARDENED_R3
         return VERR_INTERNAL_ERROR;
@@ -136 +136 @@
      * We're done.
      */
+    pThis->hDevice = hDevice;
     return VINF_SUCCESS;
 }
@@ -145 +146 @@
 {
     /*
-     * Check if we're initited at all.
-     */
-    if ((int)pThis->hDevice >= 0)
+     * Close the device if it's actually open.
+     */
+    if (pThis->hDevice != NIL_RTFILE)
     {
         if (close(pThis->hDevice))
             AssertFailed();
-        pThis->hDevice = -1;
+        pThis->hDevice = NIL_RTFILE;
     }