Changeset 50899 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Mar 26, 2014 6:08:27 PM (11 years ago)

Author:

vboxsync

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

93013

Message:

remove changes that break up log and error strings, introduced in 92972

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestProcessImpl.cpp (modified) (3 diffs)
• GuestSessionImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp

@@ -487 +487 @@
         if (RT_UNLIKELY(mData.mPID != uPID))
         {
-            Utf8Str str;
-            str  = "Stale guest process (PID=%RU32) sent data to newly started";
-            str += " process (pProcesS=%p, PID=%RU32, status=%RU32)\n";
-            LogFlowFunc((str.c_str(), uPID, this, mData.mPID, mData.mStatus));
+            LogFlowFunc(("Stale guest process (PID=%RU32) sent data to a newly started process (pProcesS=%p, PID=%RU32, status=%RU32)\n",
+                         uPID, this, mData.mPID, mData.mStatus));
             rc = VERR_NOT_FOUND;
         }
@@ -1380 +1378 @@
     {
         waitResult = ProcessWaitResult_Error;
-        Utf8Str str;
-        str  = "No error rc (%Rrc) set when guest process indicated an error\n";
-        AssertMsg(RT_FAILURE(mData.mLastError), (str.c_str(), mData.mLastError));
+        AssertMsg(RT_FAILURE(mData.mLastError),
+                             ("No error rc (%Rrc) set when guest process indicated an error\n", mData.mLastError));
         if (pGuestRc)
             *pGuestRc = mData.mLastError; /* Return last set error. */
@@ -1666 +1663 @@
                               void *pvData, size_t cbData, uint32_t uTimeoutMS, uint32_t *puWritten, int *pGuestRc)
 {
-    Utf8Str str;
-    str = "uPID=%RU32, uHandle=%RU32, uFlags=%RU32, pvData=%p, cbData=%RU32, uTimeoutMS=%RU32, puWritten=%p, pGuestRc=%p\n";
-    LogFlowThisFunc((str.c_str(), mData.mPID, uHandle, uFlags, pvData, cbData, uTimeoutMS, puWritten, pGuestRc));
+    LogFlowThisFunc(("uPID=%RU32, uHandle=%RU32, uFlags=%RU32, pvData=%p, cbData=%RU32, uTimeoutMS=%RU32, puWritten=%p, pGuestRc=%p\n",
+                     mData.mPID, uHandle, uFlags, pvData, cbData, uTimeoutMS, puWritten, pGuestRc));
     /* All is optional. There can be 0 byte writes. */
-
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 

trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

@@ -2156 +2156 @@
     if (   mData.mProtocolVersion < 2
         && s_gctrlLegacyWarning++ < 3) /** @todo Find a bit nicer text. */
-    {
-        Utf8Str str;
-        str = "Warning: Guest Additions are older (%ld.%ld) than host";
-        str += " capabilities for guest control, please upgrade them. Using protocol version %ld now\n";
-        LogRel((tr(str.c_str()), uVBoxMajor, uVBoxMinor, mData.mProtocolVersion));
-    }
+        LogRel((tr("Warning: Guest Additions are older (%ld.%ld) than host capabilities for guest control, please upgrade them. Using protocol version %ld now\n"),
+                uVBoxMajor, uVBoxMinor, mData.mProtocolVersion));
+
     return VINF_SUCCESS;
 }