Changeset 53764 in vbox

Timestamp:

Jan 9, 2015 4:03:52 PM (10 years ago)

Author:

vboxsync

Message:

Additions/VBoxService: added a few missing \n and limit the occurrence of an error message

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxService.cpp (modified) (1 diff)
• VBoxServiceVMInfo-win.cpp (modified) (1 diff)
• VBoxServiceVMInfo.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp

@@ -1073 +1073 @@
             || dwErr == ERROR_ACCESS_DENIED)
         {
-            VBoxServiceError("%s is already running! Terminating.", g_pszProgName);
+            VBoxServiceError("%s is already running! Terminating.\n", g_pszProgName);
             return RTEXITCODE_FAILURE;
         }
 
-        VBoxServiceError("CreateMutex failed with last error %u! Terminating", GetLastError());
+        VBoxServiceError("CreateMutex failed with last error %u! Terminating.\n", GetLastError());
         return RTEXITCODE_FAILURE;
     }

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp

@@ -261 +261 @@
 
             default:
-                VBoxServiceError("Token class not implemented: %ld", tkClass);
+                VBoxServiceError("Token class not implemented: %ld\n", tkClass);
                 rc = VERR_NOT_IMPLEMENTED;
                 break;

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

@@ -738 +738 @@
                         }
                         else
-                            VBoxServiceError("ConsoleKit: unable to retrieve user for session '%s' (msg type=%d): %s",
-                                             *ppszCurSession, dbus_message_get_type(pMsgUnixUser),
-                                             dbus_error_is_set(&dbErr) ? dbErr.message : "No error information available");
+                        {
+                            static int s_iBitchedAboutConsoleKit = 0;
+                            if (s_iBitchedAboutConsoleKit < 1)
+                            {
+                                s_iBitchedAboutConsoleKit++;
+                                VBoxServiceError("ConsoleKit: unable to retrieve user for session '%s' (msg type=%d): %s\n",
+                                                 *ppszCurSession, dbus_message_get_type(pMsgUnixUser),
+                                                 dbus_error_is_set(&dbErr) ? dbErr.message : "No error information available");
+                            }
+                        }
 
                         if (pMsgUnixUser)
@@ -750 +757 @@
                 else
                 {
-                    VBoxServiceError("ConsoleKit: unable to retrieve session parameters (msg type=%d): %s",
+                    VBoxServiceError("ConsoleKit: unable to retrieve session parameters (msg type=%d): %s\n",
                                      dbus_message_get_type(pMsgSessions),
                                      dbus_error_is_set(&dbErr) ? dbErr.message : "No error information available");
@@ -766 +773 @@
         {
             static int s_iBitchedAboutConsoleKit = 0;
-            if (s_iBitchedAboutConsoleKit++ < 3)
+            if (s_iBitchedAboutConsoleKit < 3)
+            {
+                s_iBitchedAboutConsoleKit++;
                 VBoxServiceError("Unable to invoke ConsoleKit (%d/3) -- maybe not installed / used? Error: %s\n",
                                  s_iBitchedAboutConsoleKit,
                                  dbus_error_is_set(&dbErr) ? dbErr.message : "No error information available");
+            }
         }
 
@@ -778 +788 @@
     {
         static int s_iBitchedAboutDBus = 0;
-        if (s_iBitchedAboutDBus++ < 3)
+        if (s_iBitchedAboutDBus < 3)
+        {
+            s_iBitchedAboutDBus++;
             VBoxServiceError("Unable to connect to system D-Bus (%d/3): %s\n", s_iBitchedAboutDBus,
                              pConnection && dbus_error_is_set(&dbErr) ? dbErr.message : "D-Bus not installed");
+        }
     }
 
@@ -1456 +1469 @@
                     {
                         static int s_iBitchedAboutLAClientInfo = 0;
-                        if (s_iBitchedAboutLAClientInfo++ < 10)
+                        if (s_iBitchedAboutLAClientInfo < 10)
+                        {
+                            s_iBitchedAboutLAClientInfo++;
                             VBoxServiceError("Error getting active location awareness client info, rc=%Rrc\n", rc2);
+                        }
                     }
                 }
@@ -1478 +1494 @@
             static int s_iBitchedAboutLAClient = 0;
             if (   (rc2 != VERR_NOT_FOUND) /* No location awareness installed, skip. */
-                && s_iBitchedAboutLAClient++ < 3)
+                && s_iBitchedAboutLAClient < 3)
+            {
+                s_iBitchedAboutLAClient++;
                 VBoxServiceError("VRDP: Querying connected location awareness client failed with rc=%Rrc\n", rc2);
+            }
         }