Changeset 18560 in vbox for trunk/src/VBox/Runtime

Timestamp:

Mar 31, 2009 7:32:44 AM (16 years ago)

Author:

vboxsync

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

45443

Message:

Fix warning on linux about decls-after-statement.

File:

• trunk/src/VBox/Runtime/VBox/log-vbox.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/VBox/log-vbox.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -29 +29 @@
  */
 
+/*
+ * Note: This file is also compiled with a C compiler so it must not
+ *       use genuine C++ features. On Linux it is compiled with
+ *       gcc -Wdeclaration-after-statement, so avoid those if you can.
+ */
 
 /** @page pg_rtlog      Runtime - Logging
@@ -187 +192 @@
     static volatile uint32_t fInitializing = 0;
     PRTLOGGER pLogger;
+    int rc;
 
     if (g_pLogger || !ASMAtomicCmpXchgU32(&fInitializing, 1, 0))
@@ -299 +305 @@
     RTTIME Time;
     RTTimeExplode(&Time, RTTimeNow(&TimeSpec));
-    int rc = RTLogCreate(&pLogger, 0, NULL, "VBOX_LOG", RT_ELEMENTS(g_apszGroups), &g_apszGroups[0], RTLOGDEST_FILE,
-                         "./%04d-%02d-%02d-%02d-%02d-%02d.%03d-%s-%d.log",
-                         Time.i32Year, Time.u8Month, Time.u8MonthDay, Time.u8Hour, Time.u8Minute, Time.u8Second, Time.u32Nanosecond / 10000000,
-                         RTPathFilename(szExecName), RTProcSelf());
+    rc = RTLogCreate(&pLogger, 0, NULL, "VBOX_LOG", RT_ELEMENTS(g_apszGroups), &g_apszGroups[0], RTLOGDEST_FILE,
+                     "./%04d-%02d-%02d-%02d-%02d-%02d.%03d-%s-%d.log",
+                     Time.i32Year, Time.u8Month, Time.u8MonthDay, Time.u8Hour, Time.u8Minute, Time.u8Second, Time.u32Nanosecond / 10000000,
+                     RTPathFilename(szExecName), RTProcSelf());
     if (RT_SUCCESS(rc))
     {
@@ -379 +385 @@
 # else  /* IN_GUEST_R3  */
     /* The user destination is backdoor logging. */
-    int rc = RTLogCreate(&pLogger, 0, NULL, "VBOX_LOG",
-                         RT_ELEMENTS(g_apszGroups), &g_apszGroups[0],
-                         RTLOGDEST_USER, "VBox.log");
+    rc = RTLogCreate(&pLogger, 0, NULL, "VBOX_LOG",
+                     RT_ELEMENTS(g_apszGroups), &g_apszGroups[0],
+                     RTLOGDEST_USER, "VBox.log");
 # endif /* IN_GUEST_R3 */
 
 #else /* IN_RING0 */
-    int rc = RTLogCreate(&pLogger, 0, NULL, "VBOX_LOG", RT_ELEMENTS(g_apszGroups), &g_apszGroups[0],
+    rc = RTLogCreate(&pLogger, 0, NULL, "VBOX_LOG", RT_ELEMENTS(g_apszGroups), &g_apszGroups[0],
 # ifdef LOG_TO_BACKDOOR  /** @todo look at guest ring 0 logging */
                          RTLOGDEST_USER,