Changeset 42162 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 16, 2012 12:26:39 PM (13 years ago)

Author:

vboxsync

Message:

Build fix, warnings.

Location:

trunk/src/VBox/Main

Files:

• include/GuestProcessImpl.h (modified) (1 diff)
• src-client/GuestProcessImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/include/GuestProcessImpl.h

@@ -75 +75 @@
     int readData(ULONG aHandle, ULONG aSize, ULONG aTimeoutMS, ComSafeArrayOut(BYTE, aData));
     int startProcess(void);
-    static DECLCALLBACK(int) GuestProcess::startProcessThread(RTTHREAD Thread, void *pvUser);
+    static DECLCALLBACK(int) startProcessThread(RTTHREAD Thread, void *pvUser);
     int terminateProcess(void);
     int waitFor(ComSafeArrayIn(ProcessWaitForFlag_T, aFlags), ULONG aTimeoutMS, ProcessWaitReason_T *aReason);

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

@@ -30 +30 @@
 #include "VMMDev.h"
 
+#include <memory> /* For auto_ptr. */
+
 #include <iprt/asm.h>
 #include <iprt/getopt.h>
@@ -159 +161 @@
     for (ProcessArguments::const_iterator it = mData.mProcess.mArguments.begin();
          it != mData.mProcess.mArguments.end();
-         ++it, ++s)
-    {
-        collection[s] = Bstr((*it)).raw();
+         it++, s++)
+    {
+        collection[s] = Bstr(*it).raw();
     }
 
@@ -186 +188 @@
     for (ProcessEnvironmentMap::const_iterator it = mData.mProcess.mEnvironment.begin();
          it != mData.mProcess.mEnvironment.end();
-         ++it, ++s)
-    {
-        collection[s] = Bstr(it->first + "=" + it->second).raw();
+         it++, s++)
+    {
+        Bstr strEnv = it->first + Utf8Str("=") + it->second;
+        collection[s] = strEnv.raw();
     }
 
@@ -467 +470 @@
             {
                 char *pszEnv;
-                if (!RTStrAPrintf(&pszEnv, "%s=%s", itEnv->first, itEnv->second))
+                if (!RTStrAPrintf(&pszEnv, "%s=%s", itEnv->first.c_str(), itEnv->second.c_str()))
+                {
+                    rc = VERR_NO_MEMORY;
                     break;
+                }
                 AssertPtr(pszEnv);
                 rc = prepareExecuteEnv(pszEnv, &pvEnv, &cbEnv, &cEnvBuild);