Changeset 9140 in vbox for trunk/src/VBox

Timestamp:

May 27, 2008 7:46:15 AM (17 years ago)

Author:

vboxsync

Message:

VBOXGUEST_RELEASE_LOG -> VBOX_RELEASE_LOG. We're not going to mix the two environments very frequently so there is no reason for making it different from what we're used to from the host. The debug logging is the same in both environments.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp

@@ -161 +161 @@
      * Try open the BSD device.
      */
-#if defined(VBOX_VBGLR3_XFREE86)
+# if defined(VBOX_VBGLR3_XFREE86)
     int File = 0;
-#else
+# else
     RTFILE File = 0;
-#endif
+# endif
     int rc;
     char szDevice[sizeof(VBOXGUEST_DEVICE_NAME) + 16];
@@ -171 +171 @@
     {
         RTStrPrintf(szDevice, sizeof(szDevice), VBOXGUEST_DEVICE_NAME "%d", iUnit);
-#if defined(VBOX_VBGLR3_XFREE86)
+# if defined(VBOX_VBGLR3_XFREE86)
         File = xf86open(szDevice, XF86_O_RDWR);
         if (File >= 0)
             break;
-#else
+# else
         rc = RTFileOpen(&File, szDevice, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
         if (RT_SUCCESS(rc))
             break;
-#endif
+# endif
     }
 
-#if defined(VBOX_VBGLR3_XFREE86)
+# if defined(VBOX_VBGLR3_XFREE86)
     if (File == -1)
         return VERR_OPEN_FAILED;
-#else
+# else
     if (RT_FAILURE(rc))
         return rc;
-#endif
+# endif
 
     g_File = File;
+
 #else
     /* the default implemenation. (linux, solaris) */
@@ -201 +202 @@
 #endif
 
-    /* Create release logger */
-    PRTLOGGER loggerRelease;
+    /*
+     * Create release logger
+     */
+    PRTLOGGER pReleaseLogger;
     static const char * const s_apszGroups[] = VBOX_LOGGROUP_NAMES;
-    int rrc = RTLogCreate(&loggerRelease, 0, "all", "VBOXGUEST_RELEASE_LOG",
-                         RT_ELEMENTS(s_apszGroups), &s_apszGroups[0],
-                         RTLOGDEST_USER, NULL);
+    int rc2 = RTLogCreate(&pReleaseLogger, 0, "all", "VBOX_RELEASE_LOG",
+                          RT_ELEMENTS(s_apszGroups), &s_apszGroups[0],
+                          RTLOGDEST_USER, NULL);
     /* This may legitimately fail if we are using the mini-runtime. */
-    if (RT_SUCCESS(rrc))
-        RTLogRelSetDefaultInstance(loggerRelease);
+    if (RT_SUCCESS(rc2))
+        RTLogRelSetDefaultInstance(pReleaseLogger);
 
     return VINF_SUCCESS;