Changeset 26512 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Feb 14, 2010 9:47:37 AM (15 years ago)

Author:

vboxsync

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

57683

Message:

HostDrivers: tabs -> spaces.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• darwin/SUPLib-darwin.cpp (modified) (1 diff)
• linux/SUPLib-linux.cpp (modified) (2 diffs)
• win/VBoxDrv.rc (modified) (2 diffs)

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

@@ -267 +267 @@
 {
     if (RT_LIKELY(ioctl(pThis->hDevice, uFunction, pvReq) >= 0))
-        return VINF_SUCCESS;
+        return VINF_SUCCESS;
     return RTErrConvertFromErrno(errno);
 }

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

@@ -182 +182 @@
      */
     if (RT_LIKELY(ioctl(pThis->hDevice, uFunction, pvReq) >= 0))
-        return VINF_SUCCESS;
+        return VINF_SUCCESS;
 
     /* This is the reverse operation of the one found in SUPDrv-linux.c */
@@ -217 +217 @@
     char *pvPages = (char *)mmap(NULL, cbMmap, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
     if (pvPages == MAP_FAILED)
-        return VERR_NO_MEMORY;
+        return VERR_NO_MEMORY;
 
     if (pThis->fSysMadviseWorks)
     {
-        /*
-         * It is not fatal if we fail here but a forked child (e.g. the ALSA sound server)
-         * could crash. Linux < 2.6.16 does not implement madvise(MADV_DONTFORK) but the
-         * kernel seems to split bigger VMAs and that is all that we want -- later we set the
-         * VM_DONTCOPY attribute in supdrvOSLockMemOne().
-         */
-        if (madvise (pvPages, cbMmap, MADV_DONTFORK))
-            LogRel(("SUPLib: madvise %p-%p failed\n", pvPages, cbMmap));
-        *ppvPages = pvPages;
+        /*
+         * It is not fatal if we fail here but a forked child (e.g. the ALSA sound server)
+         * could crash. Linux < 2.6.16 does not implement madvise(MADV_DONTFORK) but the
+         * kernel seems to split bigger VMAs and that is all that we want -- later we set the
+         * VM_DONTCOPY attribute in supdrvOSLockMemOne().
+         */
+        if (madvise (pvPages, cbMmap, MADV_DONTFORK))
+            LogRel(("SUPLib: madvise %p-%p failed\n", pvPages, cbMmap));
+        *ppvPages = pvPages;
     }
     else
     {
-        /*
-         * madvise(MADV_DONTFORK) is not available (most probably Linux 2.4). Enclose any
-         * mmapped region by two unmapped pages to guarantee that there is exactly one VM
-         * area struct of the very same size as the mmap area.
-         */
-        mprotect(pvPages,                      PAGE_SIZE, PROT_NONE);
-        mprotect(pvPages + cbMmap - PAGE_SIZE, PAGE_SIZE, PROT_NONE);
-        *ppvPages = pvPages + PAGE_SIZE;
+        /*
+         * madvise(MADV_DONTFORK) is not available (most probably Linux 2.4). Enclose any
+         * mmapped region by two unmapped pages to guarantee that there is exactly one VM
+         * area struct of the very same size as the mmap area.
+         */
+        mprotect(pvPages,                      PAGE_SIZE, PROT_NONE);
+        mprotect(pvPages + cbMmap - PAGE_SIZE, PAGE_SIZE, PROT_NONE);
+        *ppvPages = pvPages + PAGE_SIZE;
     }
     memset(*ppvPages, 0, cPages << PAGE_SHIFT);

trunk/src/VBox/HostDrivers/Support/win/VBoxDrv.rc

@@ -36 +36 @@
 VS_VERSION_INFO VERSIONINFO
    FILEVERSION          VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0
-   PRODUCTVERSION           VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0
+   PRODUCTVERSION       VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0
    FILEFLAGSMASK        VS_FFI_FILEFLAGSMASK
    FILEFLAGS            0x0L
@@ -49 +49 @@
          VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
          VALUE "FileDescription",  "VirtualBox Support Driver\0"
-         VALUE "FileVersion",      VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0"
+         VALUE "FileVersion",      VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0"
          VALUE "InternalName",     "VBoxDrv.sys\0"
          VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
          VALUE "OriginalFilename", "VBoxDrv.sys\0"
-         VALUE "ProductName",      "Sun VirtualBox\0"
+         VALUE "ProductName",      "Sun VirtualBox\0"
          VALUE "ProductVersion",   VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0"
       END